I am new to Git and Github, and so I am still very much learning on the fly. Today I noticed the original repository for the theme of this website had added updates, so I thought to apply them to my own repository.
This wasn’t as straightforward as it seemed, so here I have written down my instructions how to apply the fixes in the future.
The instructions are essentially a merging of what I read on these three pages:
I assume this is applicable for all Git related repo manipulations, but in this tutorial I am focusing on updating a Github pages theme.
- Change into my local repository on my laptop, and initialise
cd ~/<path>/<to>/<local_repo/ git init
- Check the remote information, and if no upstream branches present - add them. In this case I’m using the repo I used for my website
git remote -v git remote add upstream https://github.com/academicpages/academicpages.github.io.git
- Find the changes in the upstream branch
git fetch upstream
- Now check out of branch (not sure if this was needed, but didn’t do any harm)
git checkout master
- Now we attempt to merge the changes. Git will take anything in the upstream branch, and if no change has been made on the my personal repo in the past, will make the change. Otherwise,
merge conflicterrors will be printed to screen.
git merge upstream/master
- Take a look at which files have the merge conflicts, and inside each file look at the sections with
>>>>>and manually remove the changes (normally the upstream, or one below the
=====) that you don’t want changed. Remove the symbols above as well, save the the file. Add the file to the commit to indicate you’ve ‘fixed’ the merge conflict, for example:
git add _config.yml
- Once you’ve fixed all the merge conflicts, you can do a normal git commit and push.
git commit -m "Merged with <upstream_repo>"
And with that your website theme should be updated.