conflicts

How to resolve Git rebase merge conflicts

Stop a conflicting git rebase, rewrite the unmerged file, git add, then GIT_EDITOR=true git rebase --continue. Prove a linear graph. Never vim or --force.