07/02/2015
How to git rebase overwriting conflicts with your own changes
Quite often I find myself in a situation when I need to rebase my local feature branch containing the latest code against the master, but running git rebase master generates a bunch of conflicts that →