close

Loading...

https://docs.github.com/articles/resolving-a-merge-conflict-using-the-command-line | 05:06:34 December 22, 2020

Got an HTTP 301 response at crawl time

Redirecting to...

/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line

Impatient?