Resolve Git Conflicts

Identify, resolve, and recover from merge and rebase conflicts.

When to Use

• A git merge or git rebase reports conflicts
• A git cherry-pick cannot apply cleanly
• A git pull results in conflicting changes
• A git stash pop conflicts with current working tree

Inputs

• Required: Repository with active conflicts
• Optional: Preferred resolution strategy (ours, theirs, manual)
• Optional: Context about which changes should take priority

Procedure