Advanced / Develoment / Git

Rebase, Branch, Merge, Rebase

A good workflow:  http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-merge-questions

The short version:

• clone the remote repo
• git co -b my_new_feature
• ..work and commit some stuff
• git rebase master
• ..work and commit some stuff
• git rebase master
• ..finish the feature
• git co master
• git merge my_new_feature