Conversation

@daggertooth @bea

the >>> means their side, <<< means your side.

git will normally handle this stuff during a three-way rebase, but if you get conflicts it means you have to sort it yourself.

good luck...