Messages in this thread |  | | | Date | Sun, 11 Sep 2011 13:34:10 +1000 | | From | Stephen Rothwell <> | | Subject | Re: linux-next: manual merge of the i.MX tree with the arm-soc tree |
| |
Hi Uwe,
On Fri, 9 Sep 2011 08:40:58 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > Do you prefer that conflicts like these are resolved before you get > them? > (I.e. I could have done > > git merge -s ours $somecommitfromthearmsoctree > > but I wasn't sure that this is a good idea and so decided to wait until > you write a mail about the conflict.)
No, these small conflicts are not a problem, so just leave them to me and Arnd or Linus.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |