Re:Extremely Linear Git History
by Beltalowda on Tuesday November 22, 2022 @10:46PM
(#33714918)
> Merge commits are prone to introduce unexpected and uncaught bugs: rebases just don't.
How so? If I make an error with a rebase then I risk losing my changes. You can fetch it from the local reflog, but that's not so easy. With a merge I have a merge commit which records what was merged.
We're talking past each other. You're describing issues that come up during the git workflow. I'm talking about production bugs.
Re:Extremely Linear Git History
by Beltalowda on Wednesday November 23, 2022 @05:05AM
(#33717232)
You're being quite cryptic in this entire thread and I to be honest I have no idea what you're talking about any more.
> The "proper" solution is the one that allows me to get stuff done.
Yeah, but the stuff that needs to get done doesn't end with your commit, it starts there. Merge commits are prone to introduce unexpected and uncaught bugs: rebases just don't.