Login
From:
GitHub Docs
(Uncensored)
subscribe
Addressing merge conflicts - GitHub Docs
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts
links
backlinks
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.
Roast topics
Find topics
Find it!