Update git merge conflict post

Clarify rebase resolution