How to Merge GitHub Branches to Master

Have you pushed all your Git commits to GitHub, and now you must merge GitHub branches into Master? It's not quite a simple as a Git merge on the command line, but a GitHub branch merge into Master isn't all that difficult. Just issue the GitHub pull request, specify the GitHub branch to merge into master, and if there are no conflicts, a simple confirmation will suffice. If there is a GitHub merge conflict, resolve the conflict and then continue with the GitHub merge into the master branch.

[DavidOsborneS]

Exactly what I needed. Thank you Cameron!

[unrealdevop]

I'm going to be honest, this was really confusing and at the end when the branches files were overwritten I realized how dangerous not understanding this would be. You never explained the order of operation and I believe that the one on the left vs the one on the right that you select has some influence over what is overwriting what, which was never even mentioned. The last thing I want is to do a pull request and accidentally overwrite all the changes I was actually trying to bring over.

With binary files this is even more dangerous because you can't see what was changed and therefore have no way to identify them which makes it much easier to make a serious mistake. Can you even undo this?

[alexberger]

great and simple
thats i call how you do it in excellent way

[remigiangolec]

Thanks for this simple explanation. Subscribed.

[i__m__akshat__dwivedi]

in my case there was a default branch in my repo but i have committed in another branch and when i try to create a pull request it's showing there is nothing to compare as a beginner m stuck

[AdityaKumar-jsye]

can somebody help, it says "There isn’t anything to compare.
main and master are entirely different commit histories."

[TheWaymaker]

cheers m9 love a straightforward tutorial that just works

[TenHanger]

bad example for merge conflict resolution. Show how to delete ONE of the two versions. It's not intuitive how to edit one or the other branch out of the conflict, from your example.

[RahimX]

is it possible to merge repos on github?