resolving-merge-conflicts
Use when an active Git merge, rebase, cherry-pick, or revert has conflicts that require intent-aware interpretation and authorized file edits before Git integration can continue or abort.
Pinned to revision 4a40c0d3cfa8, 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.