And if you run into those merge conflicts mentioned above, git rerere is your friend. * A rebase is just a bunch of cherry-picks. "revert"? Nope, rerere.

To undo a pushed Git commit, either of the following two options are valid, although they each come with their own benefits and drawbacks: Undo the git push with a local git revert command and push ...

Sublime HQ – the folks behind the excellent text editor Sublime Text – has released a code editor for developers that focuses on a clean interface for coding and solving git merges. It’s ...