title: How to get git conflicts back
body: <p>I am trying to resolve merge conflicts during cherrypick and I realized I accepted the wrong version of 1 of the files. I want to see the conflicts again and choose the other version.</p>