Re: Request for adding a simple mechanism to exclude files from Git merge operation

Philip Oakley [off-list ref] writes:


[...]

quoted

The next step would then be to support

  git merge --force -- <files>

that would force to re-merge <files> with given strategy no matter what
their current status in the index is.

Isn't this already the same as the restore/checkout?

I don't think it is. I meant it to be real (partial) merge, but
performed from the state where merge is already in progress, so affected
files may have specific state in the index and in the work tree, both of
which are to be discarded before the re-merge.

-- Sergey