begin29
11/26/2015 - 12:07 PM

git-rebase.sh

#Alternate to merge
git checkout feature
git rebase master

#Smash last 2 commits
git rebase -i HEAD~2

#Conflicts? 
#resolve conflicts
git add (conflict files)
git rebase --continue