Software Development
Resolve Git Conflicts
Resolve merge and rebase conflicts with safe recovery strategies. Covers identifying conflict sources, reading conflict markers, choosing resolution strategies, and continuing or aborting operations safely. Use when a git merge, rebase, cherry-pick, or stash pop reports conflicts, when a git pull results in conflicting changes, or when you need to safely abort and restart a failed merge or rebase operation.
- Publisher / source
- pjt222/agent-almanac (found on the CSV list)
- Upstream record
- pjt222/agent-almanac
- Version
- Version 1
- Published
- Publication review
- Approved for publication · recorded passed scan 2026-11-03
- Content fingerprint
67608b11f7d4fe19e305f76992843dfef305dd4a9caa42ebc68da06c39feaad7