| | <<<Back 1 day (to 2013/04/05) | 2013/04/06 |
| mvrhel_laptop | whew. ok reflow is working. need to clean up a few things | 00:35.17 |
| | henrys you there? | 00:35.18 |
| | I am out next weekend. I will get an email out to everyone and Joan | 00:35.22 |
| | ugh more git issues | 01:05.25 |
| | enough of this for now | 01:05.27 |
| | Robin_Watts: for the logs. I want to chat with you for a bit tomorrow morning my time about git if you are available | 05:09.10 |
| Robin_Watts | mvrhel_laptop: sure. Just text me if I'm not here. | 09:23.40 |
| mvrhel_laptop | hi Robin_Watts are you around? | 15:14.55 |
| Robin_Watts | hi, got your test. | 16:39.57 |
| | text. | 16:40.00 |
| mvrhel_laptop | oh cool | 16:40.05 |
| | so I have a minor git issue | 16:40.10 |
| | related to the winRT/winrt change | 16:40.24 |
| Robin_Watts | ok | 16:40.44 |
| mvrhel_laptop | for some reason my origin/winRT is at 5043f2 which is when I had added the files that were in winRT | 16:41.21 |
| | while my local branch was at 9baa0cf which is with winrt | 16:41.38 |
| | but I have one extra commit now on the my local branch | 16:41.50 |
| Robin_Watts | So you want to push your version up to the remote ? | 16:42.12 |
| mvrhel_laptop | yes. I think just a hard push would do it | 16:42.26 |
| Robin_Watts | git push -f origin/remote | 16:42.27 |
| | If you're worried about what the differences might be, you can do: git diff 9baa0cf 5043f2 | 16:42.58 |
| | "git push -f origin remote" sorry. | 16:43.19 |
| mvrhel_laptop | hmm src refspec remote does not match any. | 16:44.08 |
| Robin_Watts | mvrhel_laptop: sorry? | 16:44.41 |
| mvrhel_laptop | that is what git bash came back with | 16:44.51 |
| Robin_Watts | god, I am brainless today. | 16:45.15 |
| | git push -f origin winRT | 16:45.21 |
| mvrhel_laptop | an error:src refspec remote does not match any | 16:45.22 |
| | error: failed to push some refs to 'blah blah my repos on casper; | 16:45.51 |
| | oh ok | 16:46.17 |
| | that worked | 16:46.32 |
| Robin_Watts | I've been stood in the cold using power tools. clearly it's affected me. | 16:46.37 |
| mvrhel_laptop | Robin_Watts: ok that fixed it | 16:46.57 |
| Robin_Watts | mvrhel_laptop: Fab. | 16:47.04 |
| | anything else? | 16:47.15 |
| mvrhel_laptop | no that is it | 16:47.19 |
| Robin_Watts | fab. I shall return to my power tools before I lose the light then. Have a good one. | 16:47.36 |
| mvrhel_laptop | I need to add in some error handling and do some beating on the windows app but most everything is in place | 16:47.39 |
| | good luck. thanks Robin_Watts | 16:47.45 |
| Robin_Watts | excellent. | 16:47.48 |
| | np. | 16:47.49 |
| | Forward 1 day (to 2013/04/07)>>> | |
IRC Logs