pb-merge-conflicts

Resolve merge/rebase conflicts systematically. Always resolve; never --abort.

Process

1. See the current state

Check git history, and the conflicting files:

git status
git log --oneline -5

Identify whether this is a merge or a rebase, and which files have conflicts.

2. Find the primary sources for each conflict