Using Git's rerere feature to escape recurring conflict hellgist.github.com96 pointsankitg1222 days ago