Instructions for merging upstream code

Periodically we update our fork of openssh-portable with the updates made to the original openssh-portable ("upstream"). Starting August 2018, our practice is to periodically update our OQS-master branch to the most recent tagged release of upstream; this way our OQS-master is always based on a "release version" of OpenSSH.

To sync the OQS-master branch with the upstream OpenSSH repository:

• If you have not already checked out this branch:
  • git clone https://github.com/open-quantum-safe/openssh-portable.git
  • git checkout OQS-master
• git remote add openssh https://github.com/openssh/openssh-portable.git
• git fetch openssh
• Use git tag --list to see the list of tags, and identify the one you want to update OQS-master to. It is probably something like V_7_7_P1.
• git merge V_7_7_P1
• Carefully resolve any conflicts
• git commit
• Test the merged source code (./configure, make, make tests)
• git push