resolving-merge-conflicts
Resolve an in-progress Git merge or rebase by recovering both sides’ intent, preserving unrelated work, and verifying the integrated result.
Pinned to revision 7e44dd88a353, 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.