85.21 Git Merge Upstream into Local

20210525 Suppose you have forked a repository as in Section 85.15 and there have been updates made to that repository that you want to fetch and then merge locally to your repository/ That’s simple:

$ git remote -v              # List the named remotes.
$ git fetch upstream         # Fetch any updates from the remote named upstream.
$ git merge upstream/main    # Merge any changes from the remote upstream branch.

It gets complicated if the upstream changes conflict with your changes. You can resolve the conflicts or else lodge a pull request to the upstream and get them to resolve them, but that would be impolite.

Your donation will support ongoing availability and give you access to the PDF version of this book. Desktop Survival Guides include Data Science, GNU/Linux, and MLHub. Books available on Amazon include Data Mining with Rattle and Essentials of Data Science. Popular open source software includes rattle, wajig, and mlhub. Hosted by Togaware, a pioneer of free and open source software since 1984. Copyright © 1995-2021 Graham.Williams@togaware.com Creative Commons Attribution-ShareAlike 4.0