Updating a fork

If you have via a fork of this repository, and need to update it, you can use one of the following methods. Whichever you choose, to avoid conflicts it is best to do so after you have committed, pushed, submitted your changes as a pull request, and had that approved and merged by the Bodleian.

Using the command line:

1. git remote add upstream git@github.com:bodleian/medieval-mss.git
2. git fetch upstream
3. git checkout master
4. git rebase upstream/master
5. git push -f origin master

Using GitHub Desktop:

1. Ensure you are viewing the master branch of your fork of medieval-mss
2. Go to Repository > Repository Settings
3. Copy and paste whatever is currently the Primary Remote Repository to a text file, then change it to git@github.com:bodleian/medieval-mss.git
4. Repository > Pull
5. Go back to Repository > Repository Settings and set the Primary Remote Repository back to what it was before
6. Repository > Push

Using the GitHub web interface:

1. Log in to https://github.com/login
2. Go to https://github.com/<myusername>/medieval-mss/compare/master...bodleian:master/ where <myusername> is replaced with your GitHub username.
3. Click Create pull request
4. Merge that new pull request into your fork's master branch
5. Update your local copy. In GitHub Desktop, ensure you are viewing the master branch of your fork of medieval-mss, then select Repository > Pull

If you run into trouble, you can delete your fork and re-fork from the Bodleian original. But you will lose any changes made on your fork which hadn't been merged into the Bodleian repository.