Re: Guided merge with override

From: Sverre Rabbelier <alturin@gmail.com>
Date: Jun 17, 2008, 08:53 UTC
Message-ID: <bd6139dc0806170153h4fba934ei62cb06e98e0280fd@mail.gmail.com>
In-Reply-To: <485756AE.9050904@viscovery.net>

On Tue, Jun 17, 2008 at 8:16 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:

Show 13 quoted lines

> Sverre Rabbelier schrieb:
>> 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.

How about 'git ls-files -t | grep "^M " | xargs git checkout B --', that would list all files that are unmerged and check them out?

-- 
Cheers,

Sverre Rabbelier