使用 Git 的 rerere 功能来逃避反复出现的冲突地狱

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