Reverting large squash commits or merge commits after other commits have been applied to the main/master branch will likely result in conflicts. On the other h

Reverting large squash commits or merge commits after other commits have been applied to the main/master branch will likely result in conflicts. On the other hand, limiting commits to do a single thing and having several per merged branch allows one to revert a problematic commit without conflicts or isolate a bug using git bisect.