4 ms·
I like this philosophy for small, easily testable commits (e.g. minor bug-fixes). However, I never recommend others to use this workflow. I feel like rebasing
by redshirtrob 13y ago
I like this philosophy for small, easily testable commits (e.g. minor bug-fixes). However, I never recommend others to use this workflow.
I feel like rebasing is the type of feature you really need to understand to use. If you understand the concept and how to apply it, you can do powerful things. If you don't, you'll munge your repo and end up begging the local git guru to bail you out of your mess.
While I don't enjoy looking at a commit history with a bunch of useless merges, it's better than encouraging users to perform an operation they don't understand.
- jen_h 13y agoNo kidding. Nothing makes you miss svn more than an inappropriate rebase. I've done it twice now, & sorely regretted. Heck, once, I was bit so badly by it that I actually said something positive about Rational Clearcase.
- mef 13y agoYes, exactly. And if your team consists of perhaps slightly less tech-oriented people (on our team it's the designers), trying to explain what rebase does and how to use it with its exceptions (the "Few notes though..." part of the article) is a recipe for confusion and broken repos. Which is why our policy is "rebase if you know what you're doing, otherwise merge".