Re: linux-next: manual merge of the i.MX tree with the arm-soc tree

[Stephen Rothwell]

Hi Uwe,

On Fri, 9 Sep 2011 08:40:58 +0200 Uwe Kleine-KÃnig <u.kleine-koenig@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature