Aaron Schrab <aa...@schrab.com> 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 <ancestor> <ours> <theirs>" should give you something close to it. "merge-recursive" is probably beyond salvaging and coaxing --cached option (i.e. tell a command that usually works both on the index and on the working tree to only work on the index) into it would be too messy to think about. Restructuring it so that it first computes the end result only in the index and then optionally allows it to check out to the working tree has been something I've wanted to do for a long time, but there is only limited amount of time in a day and the list is never dormant, so... X-<. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
