Re: Guided merge with override

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Jun 17, 2008, 06:16 UTC
Message-ID: <485756AE.9050904@viscovery.net>
In-Reply-To: <bd6139dc0806161521p3667a44ble8573be1569986a0@mail.gmail.com>

Sverre Rabbelier schrieb:

Show 9 quoted lines

> On Mon, Jun 16, 2008 at 12:16 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>> The solution depends on whether *all* files in B should be taken, or only
>> those files in B where there's a merge conflict. I don't know an easy way
>> to do the former, but the latter I'd do like this:
>>
>>        $ git diff --name-only | xargs git checkout B --
> 
> Wouldn't something similar work but do a 'git ls-files' and filter it
> on files that have a merge conflict?

Well, you could 'git ls-files --unmerged', but that prints the whole index entry, not just the name, and then you need a more complicated pipeline.

-- Hannes