...
[12:06:10 CST(-0600)] <EricDalquist> you did some work, did a local commit, didn't push. then I did a bunch of commits and pushed them, next time you did a pull the merge commit was needed
[12:06:30 CST(-0600)] <EricDalquist> or same idea but you didn't do your pull before you did your local commit
[12:06:34 CST(-0600)] <EricDalquist> which resulted in the merge
[12:07:00 CST(-0600)] <EricDalquist> either way, we both did work and committed with commit X as a parent
[12:07:15 CST(-0600)] <EricDalquist> and the result is that one of us (whoever did their work 2nd) would have to do a merge commit
[12:07:43 CST(-0600)] <athena> is there a way to prevent that from showing up? how much of a problem is it?
[12:08:04 CST(-0600)] <EricDalquist> it isn't a problem
[12:08:19 CST(-0600)] <EricDalquist> so here it is
[12:08:26 CST(-0600)] <EricDalquist> if you look at https://github.com/Jasig/uPortal/commit/6edf6ce559e94a59fa41e273dff7ddf8c0b64428
[12:08:35 CST(-0600)] <EricDalquist> you see it says there are 2 parents (all merge commits have two parents)
[12:09:32 CST(-0600)] <athena> yes
[12:09:51 CST(-0600)] <athena> so that'll just happen periodically, particularly when someone's working offline or something?
[12:09:58 CST(-0600)] <EricDalquist> yeah
[12:10:03 CST(-0600)] <EricDalquist> one parent points to commit 21631, the merge I did for arvids
[12:10:12 CST(-0600)] <EricDalquist> that was essentially HEAD in github
[12:10:25 CST(-0600)] <athena> ok
[12:10:29 CST(-0600)] <EricDalquist> the other parent is commit a4d2b
[12:10:31 CST(-0600)] <athena> just wanted to make sure i didn't miss something
[12:10:33 CST(-0600)] <EricDalquist> which you did about a day ago
[12:10:41 CST(-0600)] <EricDalquist> that is where things diverged
[12:10:55 CST(-0600)] <EricDalquist> a4d2b's parent is 8fec
[12:11:10 CST(-0600)] <athena> makes sense
[12:11:12 CST(-0600)] <EricDalquist> and my commit 73233 (from about 2 days ago) also has 8fec as parent
[12:11:58 CST(-0600)] <EricDalquist> so to avoid this what you could have done is before you made commit a4d2b is do a pull or a fetch/merge
[12:12:08 CST(-0600)] <EricDalquist> that would have gotten you up to date
[12:12:19 CST(-0600)] <EricDalquist> and then done a push as soon as you made the commit
[12:12:24 CST(-0600)] <EricDalquist> the other thing you can do is "git rebase"
[12:12:44 CST(-0600)] <EricDalquist> you should only ever do a rebase if you haven't pushed the commits anywhere
[12:12:59 CST(-0600)] <EricDalquist> what that will do is essentially undo the commits and then replay them on the new HEAD
[12:13:06 CST(-0600)] <EricDalquist> to avoid the fork in the commit history
[12:13:33 CST(-0600)] <EricDalquist> try running gitk in your uPortal directory when on the master branch
[12:13:47 CST(-0600)] <EricDalquist> you should see a nice graph where the history diverges and merges
[12:14:27 CST(-0600)] <EricDalquist> actually: https://github.com/Jasig/uPortal/network
[12:15:45 CST(-0600)] <EricDalquist> that graph shows the split and merge
[12:24:06 CST(-0600)] <athena> ahh
[12:24:16 CST(-0600)] <athena> good to know
[12:37:41 CST(-0600)] <athena> man it's awesome to have alan berg reporting bugs
[12:37:44 CST(-0600)] <athena> has done a great job
[12:37:54 CST(-0600)] <EricDalquist> yup
[12:38:10 CST(-0600)] <EricDalquist> he offered to do a pre-release qa review of 4.0.4
[13:22:49 CST(-0600)] <drewwills1> EricDalquist I added info on JPA dlm fragments: https://wiki.jasig.org/display/UPC/4.0.4
[13:23:06 CST(-0600)] <EricDalquist> awesome, thanks drew!
[13:23:32 CST(-0600)] <drewwills1> you bet man... take a look and tweak it/ask me to tweak it if you see any omissions
[13:23:43 CST(-0600)] <EricDalquist> will do