Skip to content

Git Workflow

Joshua Storm Becker edited this page Mar 12, 2017 · 3 revisions

Using GitHub

I recommend using Git through the terminal/GitBash command line, but this should transfer to the GitHub GUI as well

  1. Clone the repo if needed.
  2. Pull all branches before beginning your additions git pull from master branch
  3. Make a new branch named after the feature you are implementing git branch super-cool-feature, then checkout that branch git checkout super-cool-feature
  4. Make additions by coding and what not.
  5. Commit your change git add (all files you need to add); git commit -m "Descriptive message of additions". You can make as many commits as you want for each push.
  6. Push your commits to your branch git push origin super-cool-feature note, the super-cool-feature is whatever you named this branch.
  7. Open up GitHub in your browser and navigate to this repo. There should be a box that says you can merge from your new branch. Click to open a pull request
  8. Add a description and title to your pull request and ask someone to review your code for you!
  9. The code reviewer will let you know of any issues in your code, you can fix those issues by checking out your branch again git checkout super-cool-feature, committing and pushing the code fixes. They will then populate your pull request (PR) if you did things properly.
  10. Once reviewer is satisfied, THEY will merge your PR.
  11. Don't forget to checkout and pull from master when you move on to your next git branch git checkout master
Clone this wiki locally