·
Last changedVersion:
This version passed the hardening gate. Hardening applied 3 targeted changes and preserved all other text. Classified findings before hardening: 0. Classified findings closed: 0. Classified findings remaining: 0. Unclassified scanner findings remaining: 0. Review findings closed: 3. Review findings remaining: 6.
None
None
Expand | File | Group | Subtype | Severity | Status |
|---|
No findings available
0 findings
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.
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.
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. If rebasing, continue the rebase process until all commits are rebased.
Get started with chainctlchainctl skill install public/mattpocock/resolving-merge-conflicts:latest
Bring Chainguard's hardening pipeline to your first-party skills — custom rulesets, automated remediation, full audit trail.
skills.chainreg.biz/public/github.com/mattpocock/skills/engineering/resolving-merge-conflicts:latest
MIT
HARDENING.md
LICENSE
SKILL.md
agents/openai.yaml