resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Pinned to revision 93d2ba9c5d8b, 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.