Skip to content

Making a Pull Request

Eva Lieu edited this page Dec 10, 2019 · 3 revisions

Before making a pull request, make sure you followed the instructions in the README to get your local development environment ready.

  1. From this point, your workflow will roughly be as follows:
    • Create and checkout a feature branch. Be advised that your project manager may require a particular naming convention for branches.
    • Make changes to the files.
    • Commit your changes to the branch. Be sure to append your commit message with the issue number.
    • Push up your commits to your fork (origin).
    • Specify the upstream remote by using the command git remote add upstream <URL_OF_ORIGINAL_REPO>. You may find the URL by navigating to the repo's page and clicking on the green button labelled "Clone or download."
  2. When you have finished implementing your new feature, it's time to push your changes to origin but before you do, merge in any new changes from upstream (the original repository that you forked from) by performing the following:
    • Update your clone by running git pull upstream master. Resolve any merge conflicts as necessary.
    • Push to origin using the git push origin <BRANCH_NAME> command.
    • Sign into GitHub and navigate to your fork. You should see a button to initiate the pull request; click it. If all is well, a project maintainer will merge your request.

References

Meeting Notes

Clone this wiki locally