Re: Merge without marking conflicts in working tree

> Is there a way to do a merge but only record conflicts in the index, not
> update the working versions of files with conflict markers?
>
> Like many people, I use git to manage configuration files for my shell,
> editor, git itself, and a number of other things.  The vast majority of
> times that I update things no conflicts are occur and everything just
> works, so I'd like to avoid extra work in this case.  But occasionally a
> conflict will occur, and if it's in a file that will be read while trying
> to resolve the conflict this can make things more difficult.