2 ms·
Dunno, I’ve spent countless hours carefully grooming my git commit histories so they make sense and convey a coherent story, just to have them destroyed by some
by loloquwowndueo 3y ago
Dunno, I’ve spent countless hours carefully grooming my git commit histories so they make sense and convey a coherent story, just to have them destroyed by some squash zealot at merge time .
“Squash before merge” workflows seem to be more common these days and I have to think it’s mostly a push by people who do not know how to do interactive rebases and history rewrites.
- Aissen 3y agoYou did the right thing, and I'm sorry this happened to you. May you only have to contribute to non-squashing projects in the future.
- tempest_ 3y agoI find it has more to do with people (myself included) who interact with git at a PR/MR level. If your PRs are small and you interact with git a lot using some web portal it sort of pushes you this way.
- skydhash 3y agoSquash before merge is fine if you have a project tracker, where you can use the issue as a discussion hub to describe your thoughts. Then you put the issue number in the squashed commit message. The PR can serve as implementation specific documentation and discussion.
- loloquwowndueo 3y agoI disagree: discussion in a ticket or issue tends to be as disorganized as the random series of commits that are frowned upon in “nice commit history” workflows. It’s just sweeping the mess to another place where it can’t easily be found. But it’s okay, I gave up trying to convince people. So I’ll just disagree and commit (pun intended).