> 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 (eff

> 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`).