**** BEGIN LOGGING AT Wed Jun 25 02:59:58 2014 Jun 25 04:20:15 Rennat: I'm happy to test when you have something Jun 25 04:20:43 I don't think you can really test it in the emulator or Chrome (but I'm happy for morphis to prove me wrong ;)) Jun 25 04:28:04 Question: does the gesture area function to take you back a panel when in the settings app? Jun 25 04:28:35 In chrome when you have a smaller screen, you can't drag the panel. Jun 25 04:43:52 Let me try Jun 25 04:44:00 Any particular screen I should try it in? Jun 25 04:46:08 Seems OK in all screens Jun 25 04:47:23 Also noticed that in some the bottom bar has the ||| on the left and in others not (Wi-Fi and Screen & Lock) for example. Might be best not to have the ||| since it's not doing anything currently? Jun 25 04:50:48 OK good. Wasn't sure what the behavior is for the app when on smaller screens. I'll make all the grabbers go away when on smaller screens. Jun 25 04:51:06 :) Jun 25 04:51:16 It's good to have some consistency :) Jun 25 04:51:25 They make sense on a tablet though :) Jun 25 05:24:50 When I try to commit changed in the terminal it says: Jun 25 05:26:33 Your branch is behind origin/ master 4 commits, and can be fast forwarded. (use git pull to update your local branch) Jun 25 05:27:45 But when I try to pull it says a few of my files will be overwritten by merge so please commit or stash them... Jun 25 06:04:21 I'm no Git Expert ;) Jun 25 06:04:33 Copy your current files, pull in new ones, overwrite and copy back your changed files ;) Jun 25 06:04:56 I'm sure morphis, JaMa, Tofe or Garfonso have a nicer solution :P Jun 25 06:05:50 morning Jun 25 06:06:37 for gesture bar in chrome you can add "CoreNavi" from https://github.com/webOS-ports/deprecated-webos-ports-lib to the settings app.. preware 2 has this. Not sure if it is really working, though. Jun 25 06:07:41 Rennat: you always have to first commit your changes Jun 25 06:08:02 if you have changes that you do not want to commit, but keep (i.e. maybe not finished) you can use git stash Jun 25 06:08:16 this will revert them, and git stash pop will re-apply them. Jun 25 06:09:08 so workflow would be as follows: 1. commit finished bits, 2. stash the rest, 3. git pull or git pull -r (for rebase), 4. git push, 5. git stash pop (if you stashed something) Jun 25 06:09:47 for a merge / rebase your local changes need to be commited into your local repository. :) Jun 25 06:09:55 Rennat: ping ;) Jun 25 06:11:04 Thanks, still getting my head around github Jun 25 06:13:05 this is not a github speciality, but pure git. ;) Jun 25 06:16:03 OK so right now I should stash the stuff I have then git pull. Why would you push after you just pulled it down? Jun 25 06:16:34 I thought you want to push local changes? ;) Jun 25 06:16:47 if not, then don't push. Jun 25 06:17:48 OK, sounds good will try it out in the morning (my morning) Jun 25 06:18:09 Thanks :) Jun 25 06:18:18 you're welcome **** ENDING LOGGING AT Thu Jun 26 02:59:58 2014