Skip to content

Latest commit

 

History

History
20 lines (19 loc) · 651 Bytes

index.md

File metadata and controls

20 lines (19 loc) · 651 Bytes
title intro redirect_from versions topics children shortTitle
Addressing merge conflicts
If your changes have merge conflicts with the base branch, you must address the merge conflicts before you can merge your pull request's changes.
/github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts
/articles/addressing-merge-conflicts
/github/collaborating-with-pull-requests/addressing-merge-conflicts
fpt ghes ghec
*
*
*
Pull requests
/about-merge-conflicts
/resolving-a-merge-conflict-on-github
/resolving-a-merge-conflict-using-the-command-line
Address merge conflicts