Software Development
Resolve Merge Conflicts
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
- Publisher / source
- warpdotdev/common-skills (found on skills.sh)
- Upstream record
- warpdotdev/common-skills
- Version
- Version 2
- Published
- Publication review
- Approved for publication
- Content fingerprint
ac26cb07c75c1778513383f45df53902ad7b7f97898cf0131f2967a80a3f0e51