Managing Merge Conflicts - BKJackson/BKJackson_Wiki GitHub Wiki

Notes:

• We should not create a pull request if GitHub cannot automatically merge our branch into the main branch. Instead, we should resolve our merge conflict in third_branch in our local repository and then push our changes to GitHub after. What this means is — we should update our third_branch with the latest changes from the main branch and then push the resulting third_branch up to GitHub. This updated third_branch will be able to automatically merge with main.
• From the local third branch, I run “git pull origin main” — which means go to the GitHub repository online and pull the changes on the main branch into the current branch.

Related articles

When Automatic Merging is Not Possible