Re: Guided merge with override
- From
- Sverre Rabbelier <alturin@gmail.com>
- Date
- Jun 16, 2008, 22:21 UTC
- Message-ID
- <bd6139dc0806161521p3667a44ble8573be1569986a0@mail.gmail.com>
- In-Reply-To
- <48563D6C.8060704@viscovery.net>
On Mon, Jun 16, 2008 at 12:16 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:
Show 5 quoted lines
> 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?
-- Cheers, Sverre Rabbelier