Just to remind you of what the context of this discussion is: You commented on an article that says, paraphrased: "Stop merging criss and cross y'all, it's dum

Just to remind you of what the context of this discussion is: You commented on an article that says, paraphrased: "Stop merging criss and cross y'all, it's dumb and counterproductive; rebase everything instead, it'll help you in the long run." In that context, you asked "well merge commits are easily to revert, if i can't merge, how to i revert a feature branch?" I answered to that, in the context given by the article on which you were commenting. That context is: "Rebasing all your things is mandatory." As i said in my previous post, if you're not willing to even mentally adopt that context, then nothing i can say would be helpful. Are you interested in doing that? -- > we're not obsessive over having a "clean history", and are instead more than happy with a realistic one. I deeply resent the implication. This kind of stance is what led me to my initial post you took offense to. What you perceive as obsession is experience and knowledge by people who have experienced both sides of the coin, along with their benefits and pains, and made a rational decision on which is more favourable in the long term. You won't find me accusing you of obsession with fixed history just because you haven't had the (mis)fortune to make the full range of experiences on this. > Instead of the commits simply disappearing for a time. Nothing disappears, that is specifically why i mentioned tags. If one abandons a branch and the history is valuable to keep around, you stick a tag on the end of that branch, give it a description pointing at the ticket, then put a similar tag on the end of the remade branch, and off you go. > not to get in the way. How is git getting in the way of teamwork in your opinion? > It's not a fuck-up. Bugs are fuck-ups. There are no two ways around that. Especially when they're bad enough that a feature branch would be removed wholesale, and not simply disabled with a flag.