News for hackers. Stuff that matters.
Re:Oh Shit, Git by Nullabillity on Saturday June 25, 2022 @01:39PM (#31877141)
But you're still going to have a worse history than you would have by just letting git merge Do The Right Thing.
Re:Oh Shit, Git by dahart on Saturday June 25, 2022 @02:33PM (#31877569)
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.
Re:Oh Shit, Git by metaltyphoon on Saturday June 25, 2022 @04:02PM (#31878274)
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.