Re: Merge without marking conflicts in working tree

Aaron Schrab writes: > 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 m

Re: Merge without marking conflicts in working tree

Aaron Schrab writes: > 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? Not with Porcelain, but "read-tree -m " should give you something close to it. "merge-recursive" is probably beyond salvaging and coaxi

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 upda