resolving-merge-conflicts
用于解决合并冲突（resolve conflicts），或继续发生冲突的 Git merge 和 rebase。
Pinned to revision ebb28bc3d6ae, 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.