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