4 ms·
For ardour, we almost never squash commits because we prefer our (always linear) git history to show the actually "story" of a branch's development. There are
by PaulDavisThe1st 5y ago
For ardour, we almost never squash commits because we prefer our (always linear) git history to show the actually "story" of a branch's development.
There are two exceptions.
1. branch developer suffered from several "thinkos" along the way, the branch doesn't contain that many changes, and there's simply no benefit to seeing the contrast between the initial (mistaken) changes and the final result.
2. the branch commits create a situation where git bisect can't be properly used because intermediate commits will not compile. Squash is one option here, though it is often preferable to just re-branch and re-work commits to avoid both the bisect problem and the squash.
With a 21 year development history, we have found it invaluable to be able to trace the "thought processes" behind a series of commits, and squash would rob us of that.
- jawns 5y agoI find that forcing developers to record and publish every little mistake they made along the way has bigger downsides than the upsides of being able to follow along with their thought processes as a branch or PR evolves. Similarly, I don't really care how many times you merged main in the course of developing on a branch. Those commits are just noise to me. As long as only a single developer is working on a branch at once, I'm very comfortable with them treating commits as a work in progress, then doing an interactive rebase before merging to main to clean things up. Even in the case where multiple devs are working on a feature branch, as long as they're coordinating properly (and using safeguards such as `git push --force-with-lease`), I find more value in having tidy, organized commits at merge time than a full history of the development process.
- bastardoperator 5y agoYou have no way of knowing if a developer squashed locally...
- PaulDavisThe1st 5y agoCorrect. Rules for this stuff are pointless, but guidelines to generally follow are not.
- mads 5y agoDid you every see the commit history of someone trying to fix their Azure DevOps pipeline?