git, error, entry blah not updaed, cannot merge -

One file can not be merged, how can I merge it with git?

The error message will be ():

  Fatal: entry 'frotz 'Not uptodate can not be merged  

This means that you have local modifications to' frotz , which will be lost at checkout. You can give ' -m ' option to git checkout , which will try to merge in three ways.

Resolve occasionally

  -m - merges  

When switching branches, if you

so the current branch of local modifications in one or more files and the branch that you are switching Are different, the command denies switching branches

The merge process will be:

  git checkout -MMtepec auto-merge frog  

This merged into three ways Area after local modifications not is registered in your index file, so git diff will show you that you've changed since the tip of the new branch.

-m is done while switching branches with option, you will see something like this:

  $ git checkout -m mytopic auto-merging frotz Error: Merge merge into Frotz Fatal: Merge program failed  

At this point, git diff as the previous example Shows well-merged changes, as well as changes in disputed files.
Edit and Resolve Conflict and Resolve it with Mark Add git

  $ frotz $ git frotz in general