Git Workflow :)

Git workflow!

Triage

Get together as a group & examine unlabeled issues. Label & assign them!

Adding your own features

1. Make your branch

git checkout -b <branch>

2. make and commit changes

git add <newfile>

git commit -m "blah blah"

3. Push your branch to the remote

git push -u origin <branch>

4. (While still on your branch!!) Pull the latest master

git pull origin master

5. (While still on your branch!!) Merge the changes from master, if any

git merge master

6. Resolve any conflicts & add/commit those changes

7. Make a pull request on github!

Discarding changes that you've made

If you want to restore the a file to the version that is on master (the upstream one on GitHub).

1. If you HAVE NOT committed the changes:

git checkout origin/master -- <file>

2. If you HAVE committed the changes:

   Undo the commit: git reset HEAD~

Then restore the master version.

git checkout origin/master -- <file>