git-conflict
Resolve Git merge or rebase conflicts. Use when Git reports unmerged paths or the user asks to resolve conflicts.
Pinned to revision 25c0b2f29b91, 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.