Resolve Merge Conflicts
Overview
Resolve conflicts without opening full files unless the compact view is insufficient. Start with a summary, then inspect one conflicted file at a time.
Workflow
- Start with a summary.
Use the summary to identify which files are unresolved, which index stages exist, and how many text hunks each file contains.
- Drill into one file.
Prefer this over reading the whole file. The script prints only nearby context, the ours / base / theirs sections for each hunk, and a compact unified diff between ours and theirs.
- Resolve the file.
- Take one side wholesale with
git checkout --ours -- path/to/fileorgit checkout --theirs -- path/to/filewhen appropriate. - Otherwise edit the file directly and remove the conflict markers.
- Read more of the file only if the compact output is not enough to decide the correct merge.
- Re-check unresolved files.
- Validate the resolution.
- Ensure no unmerged paths remain.
- Ensure no
<<<<<<<,=======, or>>>>>>>markers remain in the resolved files. - Run targeted tests, builds, or linters for the touched area.
- Stage the resolved files.
Commands
Summary only
Detailed view for one file
Detailed view for all conflicted files
JSON output
Tune output size
Notes
- Use the script before opening conflicted files directly.
- Resolve one file at a time to keep context small.
- Expect marker-based text conflicts and index-only conflicts such as add/add or modify/delete. The script summarizes both, and it falls back to index-stage previews when the worktree file has no conflict markers.
