...
[12:29:17 CST(-0600)] <athena> i'll sort it out 
[12:29:41 CST(-0600)] <EricDalquist> what the person requesting the merge should do is either rebase or merge the source into their branch
[12:30:01 CST(-0600)] <athena> ooh
[12:30:01 CST(-0600)] <EricDalquist> or if your feeling nice you can do a manual merge and solve the conflicts yourself
[12:30:09 CST(-0600)] <athena> yeah, i may do that
[12:30:13 CST(-0600)] <athena> but makes sense that that's an option
[12:30:16 CST(-0600)] <EricDalquist> depends on if you want them to do the work or if you want to
[12:30:25 CST(-0600)] <athena> yeah i'll probably just do it