Contribute to Upstream - Jayich-Lab/artiq GitHub Wiki

To make a contribution to the upstream repository, GitHub Desktop does not provide enough capability. Here shows an example of how to do it using Git Bash, but different tool/workflow can be used. Read https://github.com/m-labs/artiq/blob/master/CONTRIBUTING.rst before proceeding.

  • Raise issues in the upstream repository as needed.
  • Open Git Bash and cd to a clone of this fork repository.
  • Make a new branch based on the upstream master branch: git checkout -b __new_branch_name__ upstream/master.
  • Add all the changes, and make commits with suitable grouping of changes. Make sure to sign off all commits.
  • Push the branch to the forked repository using git push -u origin __new_branch_name__.
  • Make a pull request merging __new_branch_name__ to m-labs:master. Do all checks as instructed in the pull request template.