Hi, On Fri, 06 Aug 2010 13:33:27 +0900 Kukjin Kim <kgene.kim@xxxxxxxxxxx> wrote: > > I will merge Dmitry's merge commit that you inform to me in my tree. > Then, conflict may be not happened tomorrow. :-) OK. Thanks. > I wonder...as you know, my tree will going to upstream through Russell's > tree...if his tree doesn't having it, is it no problem when he merges my > tree? > I mean, is it no problem that there are Dmitry's stuff which has been merged > into Linus' in my tree when I'm sending 'pull request' to Russell? It should cause no problem to Russell or Linus - git is good at ignoring common subtrees when merging. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpf6KBQ6QjAY.pgp
Description: PGP signature
