3 ms·
100% team rebase -- I think the fear comes from "rewriting history", which sounds scary until you realize that git is entirely immutable data store (through the
by elijahbenizzy 2y ago
100% team rebase -- I think the fear comes from "rewriting history", which sounds scary until you realize that git is entirely immutable data store (through the API at least). Blockchain for the win!
I find merging to be extremely tough to work with -- I don't think I actually got good at git until I learned to rebase entirely.
Also, cherry-picking (effectively an atomic rebase-type) is underrated.
- pdonis 2y ago> git is entirely immutable data store Not entirely, since git can automatically garbage collect commits that aren't reachable.
- edfletcher_t137 2y ago> I find merging to be extremely tough to work with -- I don't think I actually got good at git until I learned to rebase entirely. > Also, cherry-picking (effectively an atomic rebase-type) is underrated. This this this, all of this. I never really "got git" until I finally committed to learning how rebase works. +1 to cherry-picking. Also patch-add (`add -p`).