resolve-conflicts
Use when you need to resolve an in-progress git merge, rebase, or cherry-pick conflict — <<<<<<< markers are present, or git status shows unmerged paths.
Pinned to revision 728894f3f85f, so it is the text this page describes rather than whatever the author pushed since.
Files
Every link opens the file at its source, pinned to the revision this page describes.