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.

Did this doc help you?

Privacy policy

Help us make these docs great!

All GitHub docs are open source. See something that's wrong or unclear? Submit a pull request.

Make a contribution

Or, learn how to contribute.