| *** mlncn has quit IRC | 00:56 | |
| *** bkuhn is now known as bkuhnIdle | 01:31 | |
| *** bkuhnIdle is now known as bkuhn | 02:12 | |
| *** bkuhn has quit IRC | 02:30 | |
| *** bkuhn has joined #npoacct | 02:41 | |
| *** mlncn has joined #npoacct | 02:43 | |
| *** garrison has joined #npoacct | 03:11 | |
| *** garrison has quit IRC | 03:48 | |
| *** bkuhn has quit IRC | 05:44 | |
| *** tgnitidle has joined #npoacct | 07:24 | |
| *** tgnit has quit IRC | 07:27 | |
| *** tgnitidle has quit IRC | 07:54 | |
| *** tgnit has joined #npoacct | 07:58 | |
| tgnit | tbm: ping | 08:08 |
|---|---|---|
| *** tgnit has quit IRC | 09:37 | |
| *** tgnit has joined #npoacct | 10:36 | |
| *** tgnit has quit IRC | 10:41 | |
| *** tgnit has joined #npoacct | 10:57 | |
| *** mlncn has quit IRC | 11:46 | |
| *** mlncn has joined #npoacct | 11:46 | |
| *** tgnit has quit IRC | 12:47 | |
| *** tgnit has joined #npoacct | 12:48 | |
| *** bkuhn has joined #npoacct | 14:39 | |
| tgnit | bkuhn : please checkout my feature precision branch and pull request #312 | 15:21 |
| * bkuhn looks | 15:24 | |
| bkuhn | tgnit: one issue is that you shouldn't really be showing your merges of master back into your branch, rebasing would have been better. | 15:27 |
| tgnit | bkuhn: should i rectify now? | 15:28 |
| bkuhn | Not a bad idea. | 15:28 |
| bkuhn | Admittedly, we know johnw will reject the PR. | 15:28 |
| tgnit | ok | 15:28 |
| bkuhn | But, it'd be good if it's rejected for the "right reason" :) | 15:28 |
| bkuhn | tgnit: if you need to reconstruct the changes on top of current master, you might use git cherry-pick to cherry-pick the changes onto a new branch but skip the merges | 15:29 |
| tgnit | hmm, i do it, meanwhile can you test it on your books? | 15:30 |
| bkuhn | Yeah, I can. | 15:48 |
| bkuhn | My regression tests take hours to run, so I won't have an answer for you until tomorrow. | 15:48 |
| tgnit | bkuhn:. more trouble, i rebased and it now shows all the merged commits in pull request | 16:11 |
| bkuhn | tgnit: I really recommend you start from a pristine master branch, create a new branch from it, and then git cherry-pick your changes in, then use that branch for merge. | 16:25 |
| tgnit | hmm, i was resetting any way, ok | 16:26 |
| tgnit | bkuhn: done without creating a new branch, did a rebase finally | 16:45 |
| bkuhn | tgnit: Great, merge request looks clean. | 17:15 |
| *** mlncn has quit IRC | 19:12 | |
| *** mlncn has joined #npoacct | 19:20 | |
| *** bkuhn is now known as bkuhnIdle | 19:34 | |
| *** bkuhnIdle is now known as bkuhn | 20:01 | |
| *** tgnit has quit IRC | 22:39 | |
| *** mlncn has quit IRC | 22:46 | |
Generated by irclog2html.py 2.12.1 by Marius Gedminas - find it at mg.pov.lt!