Merge upstream repository with my fork #23694
-
Hello, Now, the client found out that my fork does not have the latest changes from their main branch, so they asked me to merge the main branch with my fork. I have been looking around for how to to this and I found these two articles: I’m really confused now and have several questions:
Any help would be greatly appreciated! Thanks in advance! |
Beta Was this translation helpful? Give feedback.
Replies: 2 comments
-
Hi @learnjavawithreshma, welcome to the GitHub Support Community! Both of these help articles actually explain how to do mostly the same thing: merge an upstream branch into your own local copy. They just use slightly different commands to do so. The “Syncing a fork” article is more for beginners, including adding the parent of your fork as a new remote and specifically targeting the As for GitHub Desktop, I don’t have an article to share directly but Desktop should have some tools to help you with this. When you clone a fork it should give you some options on how you’re planning to use this fork, so I’d recommend giving these choices a read and select the best option for your project: As for actually syncing your fork, from the branch selector dropdown you can choose a branch to merge into your currently checked-out branch using the button at the bottom: You should see an option named Doing this should update your local repository—and therefore your own fork—with any changes made to the original parent. |
Beta Was this translation helpful? Give feedback.
-
Thank you so much for the detailed explanation. I will give it a try! Regards, |
Beta Was this translation helpful? Give feedback.
Hi @learnjavawithreshma, welcome to the GitHub Support Community!
Both of these help articles actually explain how to do mostly the same thing: merge an upstream branch into your own local copy. They just use slightly different commands to do so.
The “Syncing a fork” article is more for beginners, including adding the parent of your fork as a new remote and specifically targeting the
master
branch and giving you commands to use to sync that. The other article assumes you already have knowledge of these things and doesn’t explain as much, but it does do pretty much the same thing!As for GitHub Desktop, I don’t have an article to share directly but Desktop should have some tools to help yo…