git - resolved SVN分支合并产生的冲突之后，如何再次重现该冲突

Question

我还想重新恢复这个冲突，再次解决冲突，该如何恢复呢？

Answer 1

This is a new request.
You can revert to two adjacent versions before the conflict. Then compare locally. You can see the difference between the two times (in fact, you can just check the history without replying)