Using Git's rerere feature to escape recurring conflict hell

Using Git's rerere feature to escape recurring conflict hell (gist.github.com)

75 points

byankitg12

10 hours ago |