✳flâneur — a map of the web's best reading

git rebase: what can go wrong?

jvns.ca · 3,128 words · saved by 1 readers

Hello! While talking with folks about Git, I’ve been seeing a comment over and over to the effect of “I hate rebase”. People seemed to feel pretty strongly about this, and I was really surprised because I don’t run into a lot of problems with rebase and I use it all the time. I’ve found that if many people have a very strong opinion that’s different from mine, usually it’s because they have different experiences around that thing from me. So I asked on Mastodon: today I’m thinking about the tradeoffs of using git rebase a bit. I think the goal of rebase is to have a nice linear commit history, which is something I like. but what are the costs of using rebase? what problems has it caused for you in practice? I’m really only interested in specific bad experiences you’ve had here – not opinions or general statements like “rewriting history is bad” I got a huge number of incredible answers to this, and I’m going to do my best to summarize them here. I’ll also mention solutions or workaroun

Hello! While talking with folks about Git, I've been seeing a comment over and over to the effect of "I hate rebase". People seemed to feel pretty strongly about this, and I was really surprised because I don't run into a lot of problems with rebase and I use it all the time. I've found that if many people have a very strong opinion that's different from mine, usually it's because they have different experiences around that thing from me. So I asked on Mastodon : today I'm thinking about the tradeoffs of using git rebase a bit. I think the goal of rebase is to have a nice linear commit history

Explore this link on the map →

related reading