Using Git's rerere feature to escape recurring conflict hell
https://gist.github.com/skipcloud/f1033afb4fa5681d69fa63458cc95928
#ReadItLater
Using Git's rerere feature to escape recurring conflict hell
https://gist.github.com/skipcloud/f1033afb4fa5681d69fa63458cc95928
#ReadItLater