Thanks everybody, On 6/17/08, Sverre Rabbelier <alturin@xxxxxxxxx> wrote: > On Mon, Jun 16, 2008 at 12:16 PM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> 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 > > > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
