Hacker News new | ask | show | jobs
by Nullabillity 1461 days ago
But you're still going to have a worse history than you would have by just letting git merge Do The Right Thing.
2 comments

Naw, merge is orthogonal to cleaning up local history. Merging a mess is still a mess. Some people are fairly clean from the start, and some aren’t. And it depends on the task at hand, messes are easier to make when you’re doing more than one thing at a time.
Do you care to explain? How can you have a worst history when the `main` / `develop` branch have a linear history? I rather have a linear history where git bisect is trivial to use then a mess of merges and a hard to follow history.