title: Git Merge Conflict (UU): How do I resolve conflict without adding file to next commit?
body: <p>How do I resolve a UU (merge conflict) without adding that file to the next commit.</p>
  
  <p>For example, I just cherry picked a commit to another branch and there were merge issues. I solved the merge issue and want UU readme.txt changed to M readme.txt but it not be added to the next commit I make.</p>
  
  <p>Thanks</p>