error: could not apply ****... ****** hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' Resolved '***********' using previous resolution.
忘记了以前修改,想重新解冲突,可以暴力使用下面的命令删除以前缓存
rm -rf .git/rr-cache
详尽学习: http://loveky.github.io/2013/11/27/git-rerere/