Resolving conflicts
Resolve conflicts file by file, preserving both the intended local change and the incoming behavior before marking anything resolved.
On this page2
Steps
- Run git status in Terminal and list every unmerged path.
- Open each file in Editor and remove conflict markers after choosing the correct combined content.
- Run focused tests or render the affected output.
- Use git add with the exact resolved paths, then review git diff --cached before continuing the merge or rebase.
Expected result
Git reports no unmerged paths, the staged resolution contains the intended content, and relevant checks pass.
Note: Abort the merge or rebase only after confirming what Git will restore and preserving unrelated work.