i despise rebase. have worked on many teams that enforced it, heard the arguments, clean timeline, easy to follow, yadda yadda

truth is don't even get me started on fixing conflicts one by one,  and nothing beats being able to checkout to a merge commit to debug things, and 

git was made for merge