MorrisJobke

How to do a git rebase 03 Dec 2015

How I do the git rebase:

merge conflict

I use my own alias git lg that shows clearly how many commits are between the current branch and the master (should only be yours). A git lg with 8 commits above master on branch def looks like this:

merge conflict

Note: The tricky part is to keep calm during the initial rebase session ;)