[12:04:06 CST(-0600)] <athena> err, hmm
[12:04:16 CST(-0600)] <athena> EricDalquist: do you know how did this happened?
[12:04:22 CST(-0600)] <EricDalquist> ?
[12:04:26 CST(-0600)] <athena> https://github.com/Jasig/uPortal/commit/6edf6ce559e94a59fa41e273dff7ddf8c0b64428
[12:05:19 CST(-0600)] <EricDalquist> I'm guessing you had a local commit
[12:05:34 CST(-0600)] <EricDalquist> so one of two ways it could happen
[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