Using Git's rerere feature to escape recurring conflict hellgist.github.com
76 points by ankitg12 10 hours ago | 31 comments