resolving merge conflicts
- Repo stars 0
- Author updated Aug 24, 2026, 02:19 PM
- Author repo skills
- Domain
- Engineering
- Author-declared agents
- No explicit declaration found; this is not inferred or tested compatibility
- Static check
- 88 / 100 · heuristic scan, not runtime safety proof
- Runtime evidence
- Not run; no isolated runtime test evidence is currently recorded
- Author / version / license
- @mattpocock · no license declared
- Token usage
- Lean
- Setup complexity
- Plug-and-play
- External API key
- Not required
- Operating systems
- Unspecified (assume cross-platform)
- Runtime requirements
- No explicit requirements detected
- Detected file/system behavior
-
- Read-only
- Network behavior
- Local-only
- Install commands
- None (reference only)
Heads up: Tool permissions are not declared; actual access depends on the runtime.
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **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.
3. **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`.
4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Sections and files
Listed in source order.
sections -> See the current state → Find the primary sources → Resolve each hunk. → → Finish the merge/rebase.
terms -> See the current state · Find the primary sources · Resolve each hunk. · not · automated checks · Finish the merge/rebase.
files/cmd -> --abort · merge/rebase. · issues/tickets.
body sha256 -> bfe63225833a
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.