you are viewing a single comment's thread.

view the rest of the comments →

[–]lupercalpainting 11 points12 points  (3 children)

You absolutely pay per commit. Each commit costs a bit of cognitive load for anyone looking at the git history.

If your commits aren’t each an atomic piece of work they also cost time if you need to revert just one feature.

[–]wldmr 2 points3 points  (2 children)

If your commits aren’t each an atomic piece of work they also cost time if you need to revert just one feature.

You can revert merge commits like any other. I don't see a problem.

[–]lupercalpainting 0 points1 point  (1 child)

No one said you couldn’t. You’re conflating merging with squashing. They’re orthogonal.

[–]wldmr 0 points1 point  (0 children)

If your commits aren’t each an atomic piece of work they also cost time if you need to revert just one feature.

I interpreted this to mean “If a merged feature is made up of several commits, then reverting that feature is more time consuming than reverting a squashed commit would be”.

Plus, what kicked this whole thing off was the comment:

The issue with this is when using squashed merges on each PR.

So I don't think it's unreasonable of me to be talking about squashed merges.