In message <[EMAIL PROTECTED]> you wrote: > > Yes, William hit the point. Actually It seems my work is based on two > different custodian trees, for example, Scott's NAND tree and > u-boot-at91 tree. If the 2 two trees do not merge each other, > sometimes I got screwed. I guess `git ' may help at this situation, > but I don't know how. :-) I just wanted to know the status of the > NAND tree. Maybe I did not express myself clearly in the last email.
You can create your own local development branch, and merge both the NAND testing branch and the at91 stuff into this branch. There may be merge conflicts, of course, but I think both trees are pretty orthogonal to each other, so chances for such conflicts are probably small. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] "Who is the oldest inhabitant of this village?" "We haven't got one; we had one, but he died three weeks ago." ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
