-
Notifications
You must be signed in to change notification settings - Fork 51
How to do PRs
Oliver Beckstein edited this page Nov 15, 2017
·
6 revisions
The Developer Guide provides the broad picture. This page provides more detailed guidance on development with git
and GitHub. In particular, it provides guidance on how to set up a pull request (PR) that is easy to manage.
If you use your own fork to create the PRs read GitHub's documentation on Working with Forks.
The most important points: Add the alchemistry.org main repos ("upstream") as git remotes. E.g., for alchemistry/alchemlyb:
git remote add upstream [email protected]:alchemistry/alchemlyb.git
Sync your own checked out copy with the upstream
git checkout master # make sure you're on master
git pull upstream master
Create a new branch for each PR. The workflow should be:
git checkout master
git pull # update from GitHub
git checkout -b issue-NNN-SUMMARY
# hack on code
git add ...
git commit ...
# hack more...
# ...
# push to a branch
git push -u origin issue-NNN-SUMMARY
# use GitHub to create a PR from the branch
For more details read GitHub's
- Creating a pull request (if you are working directly on the alchemistry repository)
- Creating a pull request from a fork