ITIS Git Flow

gistfile1.md

1. Update master

• git checkout master - Switch to master
• git fetch --all - Pull down metadata from all remotes
• git merge origin master - Merge changes from origin master into your current branch

2. Create feature branch

• git checkout -b [feat/fix]-<Ticket>-<Description> - Create new branch
• git push -u origin <branch name> - Push branch to remote "origin" and set as upstream

3. DEVELOP! (Rinse and Repeat)

• Commit early, commit often - include the ticket # in commit messages
• Fetch & merge changes regularly, and rebase if needed.
• Push at end of the day

4. Merge to staging

• (Optional): Create a new staging branch for your staging.
• git checkout -b <branch name>-staging
• git push -u origin <branch name>-staging
• git fetch --all
• git rebase -i origin/staging
• Squash your changes

5. Merge to master

• DO NOT BASE OFF YOUR STAGING REBASE
• git checkout <branch-name> - Get off your staging rebased branch
• git fetch --all
• git rebase -i origin/master
• Squash your changes

Learn Git!

Try to make a habit of breaking out from your IDE. Use the command line to interact with git!

Also - check out this free course!
https://www.codeschool.com/courses/try-git

After you do the introductory git course, the others are worth it, but you can also check out:
https://www.youtube.com/watch?v=m1AUMnPeRfs

BrowserSync is a good tool for testing and sharing with others:
http://www.browsersync.io/

Atlassian has a great Git tutorial with a rebase section:
https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase-i