One of the most powerful tools a developer can have in their toolbox is git rebase. Yet it is notorious for being complex and misunderstood. The truth is, if you understand what it actually does, git rebase is a very elegant, and straightforward tool to achieve so many different
I’ve accidentally had my git config set to rebase at my work. Every git pull merge dragged me into some conflict hell.
I’m still interested and will read this article, mainly to see if there is a way to use it if the rest of the department isn’t.
If you copied pasted your config and don’t know what each line does, delete it.
Also, don’t forget to personally audit Linux source code, before you use it.