3 ms·
Eh I couldn't rebase to save my life but basic git is fairly easy to grok and useful.
by castlecrasher2 8y ago
Eh I couldn't rebase to save my life but basic git is fairly easy to grok and useful.
- jondwillis 8y agoIt’s exactly like merging but you have to resolve any conflicts commit-by-commit instead of all at once in a merge commit. Useful for if you’ve been working on a feature and want to pull in changes your colleagues have made on the develop or master branch without muddying up your history with merge commits. Having clean history makes diffing easier for code reviews. I’ll admit even after years of rebasing, I still screw it up from time to time.