sh git-rebase.sh

Posted 2021-05-07

#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