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.

What is the right chronological order of the git saga? Should I read this before of after the git checkout trilogy?

so bloody complicated it needs a book

I recommend Drew Devault’s guide https://git-rebase.io/ it’s shorter and easier to follow.