-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
This is not the latest version.
Viewing v1.0, published June 18, 2026.
resolving-merge-conflicts v1.0
as of v1.0latest is B
Use when you need to resolve an in-progress git merge/rebase conflict.
NewPublished June 18, 2026all versions
Byte-exact. Everything on this page is exactly what v1.0 published, including every file.
What changedInitial version — nothing to compare.