I’m totally new to GitHub. I have just started working on a project where the client asked me to fork their repository and work on it. I downloaded the Github desktop app and managed to do this.
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:
- Which of the above articles do I need to follow
- What is the difference between the two (That is merging an upstream repository and syncing a fork)
- Both the articles above suggest using the git bash. Is there some way to achieve what I want via the GitHub desktop app?
Any help would be greatly appreciated!
Thanks in advance!