...
[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