The idea that resolving conflicts in a merge commit is better than in individual rebased commits is very very wrong. It might be more expedient, but it is also

The idea that resolving conflicts in a merge commit is better than in individual rebased commits is very very wrong. It might be more expedient, but it is also more likely to do introduce a difficult-to-bisect error than considering each commit as if written in the current state of the world.