Learn Git Branching
4 points by veqq
4 points by veqq
Quite a few recent discussions about how difficult git is etc. but this game quickly teaches it, very quickly and easily, because it actually shows you the commit nodes as a graph! Yes, git could have a better API, features etc. but most developers will get a lot out of this.
Yet another git beginner’s guide teaching people to rebase (the beginning of intro4 is especially egregious). :/
I prefer rebasing to merging. Can you make a compelling argument as to why I should prefer it the other way around?
Because sooner or later you’ll rewrite history for public branches and trigger conflicts for the people that work alongside you.
Not only have I never seen this happen, if you do accidentally include a commit that already exists, it contributes nothing to the diff. In the rare case that it does change something, the review should catch unrelated changes.
If this is a big problem you keep encountering I’d love to know more about your process.
I’m not saying this is a problem that can’t be solved, I’m saying that you’re breaking the expectations other people have from their branches. And it’s not about code reviews, it’s about of linearity of repo history.