Re:Fossil: Rebase Considered Harmful
by isbadawi on Wednesday February 24, 2021 @10:30AM
(#26250896)
It makes sense to me that merge commits would "contain changes" (i.e. that a merge commit's tree would have content that is not in either parent's tree), otherwise how else would you represent the result of resolving merge conflicts?
My team now only use rebase, clean up commit using squash, and fix conflict before landing commit on master branch are kind of natural using rebase. Lead developer also have easier time to check file changes.