Re: Guided merge with override

From: Geoff Russell <geoffrey.russell@gmail.com>
Date: Jun 16, 2008, 22:45 UTC
Message-ID: <93c3eada0806161545m5c6e1073q5522ce31f72be9f0@mail.gmail.com>
In-Reply-To: <bd6139dc0806161521p3667a44ble8573be1569986a0@mail.gmail.com>

Thanks everybody,

On 6/17/08, Sverre Rabbelier <alturin@gmail.com> wrote:

Show 6 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 --

This looks like a manageable approach and better than the scripting I was thinking about -- ie. scan the conflict files with perl and fix them!

Cheers, Geoff

Show 11 quoted lines

>
>
> Wouldn't something similar work but do a 'git ls-files' and filter it
>  on files that have a merge conflict?
>
>  --
>  Cheers,
>
>
>  Sverre Rabbelier
>

-- 
6 Fifth Ave,
St Morris, S.A. 5068
Australia
Ph: 041 8805 184 / 08 8332 5069