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.

Ask a human

Can't find what you're looking for?

Contact us