feat: add git conflict resolution skill

[alex-solovyev]

Summary

• Add tools/git/conflict-resolution.md -- comprehensive guide for resolving git merge, rebase, cherry-pick, and stash pop conflicts
• Add cross-references from workflows/pr.md and workflows/branch.md (replacing 6-line stub with pointer to detailed guide)
• Add to AGENTS.md progressive disclosure table under Git/PRs domain

What's covered

• Decision tree for conflict resolution
• Conflict markers explained (with diff3 base version)
• Strategy options (-Xours/-Xtheirs, patience, ignore-space)
• Per-file resolution (--ours/--theirs, manual 3-way merge)
• Scenario workflows: merge, rebase, cherry-pick, stash pop
• Common patterns: rename/delete, lock files, binary, add/add
• git rerere setup, usage, GC config, safety tips
• AI-assisted resolution guidance
• Prevention strategies and recommended git config
• Error recovery (abort, reset, revert, reflog)

Gap filled

The framework had extensive conflict avoidance (worktrees, pre-edit-check, branch-first) but virtually zero conflict resolution guidance. The self-improving-agents system itself flagged this gap as an example improvement that was never implemented.

Closes t153

Summary by CodeRabbit

• Documentation
  • Added comprehensive Git conflict resolution guide covering workflows, resolution strategies, and best practices.
  • Updated branch and pull request workflow documentation to reference the new conflict resolution guide for detailed guidance.

[gemini-code-assist]

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

[coderabbitai]

Walkthrough

The PR introduces a comprehensive Git conflict resolution guide and updates existing workflow documentation to reference this new resource. A progress tracking table is also updated to reflect the addition of the new guide.

Changes

Cohort / File(s)	Summary
New Conflict Resolution Guide .agents/tools/git/conflict-resolution.md	New 371-line documentation file covering Git conflict resolution workflows, decision trees, resolution strategies, markers, rerere configuration, prevention techniques, and error recovery.
Documentation Updates .agents/AGENTS.md, .agents/workflows/branch.md, .agents/workflows/pr.md	Updated progress table and workflow guidance to cross-reference the new conflict-resolution.md document, replacing generic instructions with pointed references to detailed guidance.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Poem

🌿 When branches clash and conflicts brew,
A guide now maps the path for you,
With strategies clear and markers shown,
Resolution workflows fully grown! 🎯

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change: adding comprehensive Git conflict resolution documentation as a new skill/capability to the framework.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch feature/t153-conflict-resolution-skill

---

No actionable comments were generated in the recent review. 🎉

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🔍 Code Quality Report

�[0;35m[MONITOR]�[0m Code Review Monitoring Report

�[0;34m[INFO]�[0m Latest Quality Status:
SonarCloud: 0 bugs, 0 vulnerabilities, 33 code smells

�[0;34m[INFO]�[0m Recent monitoring activity:
Sun Feb 8 02:56:06 UTC 2026: Code review monitoring started
Sun Feb 8 02:56:06 UTC 2026: SonarCloud - Bugs: 0, Vulnerabilities: 0, Code Smells: 33

📈 Current Quality Metrics

• BUGS: 0
• CODE SMELLS: 33
• VULNERABILITIES: 0

Generated on: Sun Feb 8 02:56:09 UTC 2026

---

Generated by AI DevOps Framework Code Review Monitoring

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[alex-solovyev]

Reopening: task was falsely marked complete in TODO.md, triggering auto-close via issue-sync. Reverted in PR #616.