Git Merge Conflict (UU): How do I resolve conflict without adding file to next commit?

How do I resolve a UU (merge conflict) without adding that file to the next commit.

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.

  • Visual Studio 2013 remove deleted git branches
  • Git fetch and include all .gitignore files
  • Rspec stops working suddenly because of `require': no such file to load
  • Does the libgit2 project or anyone else provide sample code to demonstrate the various libgit2 functions?
  • Access Git repo via SSH tunnel
  • Combining multiple git repositories
  • Thanks

  • No git color schemes under rxvt/cygwin
  • Git describe build dependency
  • Install R package from Atlassian Stash
  • New commits aren't on the head
  • Smartgit: Moving local changes from stash to branch
  • Git automatically merge a file
  • One Solution collect form web for “Git Merge Conflict (UU): How do I resolve conflict without adding file to next commit?”

    I don’t know what version of git you were using back in ’11, but right now I’m on

    It appears to me that doing an add to mark the conflict resolved does add the file to the stage; so my approach is:

    git add <filename>
    git reset HEAD <filename>

    You could also create a custom git command that does this for you. I created an executable file named git-resolve (no extension) in a directory on my path (I like to put stuff like this in ~/.bin) and put this in it:

    git add $@
    git reset HEAD $@

    Then from the command line, after I’ve resolved my conflicts, I can do:

    $ git resolve <filename>
    Git Baby is a git and github fan, let's start git clone.