Files
resolving-a-merge-conflict-using-the-command-line
404 - page not found
The
main
branch ofdocs
does not contain the pathpull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.