From: Sverre Rabbelier Date: Mon, 16 Jun 2008 22:21:39 GMT Subject: Re: Guided merge with override Message-ID: In-Reply-To: <48563D6C.8060704@viscovery.net> On Mon, Jun 16, 2008 at 12:16 PM, Johannes Sixt 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? -- Cheers, Sverre Rabbelier