In this post I present a Git branching strategy for developing and releasing software as I’ve used it in many of my projects, and which has turned out to be very successful.
This page gives brief, visual reference for the most common commands in git. Once you know a bit about how git works, this site may solidify your understanding.
So you fixed a conflict somewhere in your repo, then later stumbled on exactly the same one… Enter 'rerere', which stands for Reuse Recorded Resolution.