How to re-generate an unresolved git merge file

In the middle of editing an unmerged file to resolve merge conflicts, I decided to start from scratch on the one file. How can I re-generate the original unresolved file with the standard markers. There can be other files that are already fixed and staged, and yet others waiting to be fixed.

  • What is the right approach to deal with Rails db/schema.rb file in GIT?
  • Git error: <filename> is far too short to be a packfile
  • Git push hangs when pushing to Github?
  • git jenkins scm plugin Permission denied
  • How do I get changes from my trunk into a branch?
  • How to apply `git diff` patch without Git installed?
  • Update Git branches from master
  • First time using node.js - “ReferenceError: node is not defined”
  • Editing a git submodule
  • How to tell git that two commits are the same?
  • ssh-agent suddenly “lost” my key
  • Undo git rm -f
  • One Solution collect form web for “How to re-generate an unresolved git merge file”

    git checkout -m <file-name>
    Git Baby is a git and github fan, let's start git clone.