Using Git's rerere feature to escape recurring conflict hell

85 pointsgist.github.com
ankitg1219hrs