Home

How to pull in upstream changes

In a clean directory pulled from IACR/hotcrp, you can perform the following steps to pull in changes from kohler/hotcrp into IACR/hotcrp. It's possible when we do this that we'll encounter merge conflicts if we have changed hotcrp in some way that collides with future changes.

git remote add upstream https://github.com/kohler/hotcrp.git
git fetch upstream
git checkout master
git merge upstream/master
git push