Messages in this thread | | | Date | Thu, 13 Mar 2003 01:13:32 +0100 | From | Pavel Machek <> | Subject | Re: BitBucket: GPL-ed KitBeeper clone |
| |
Hi!
> I don't know, if the problem really changes that much. How do > you pick a globally unique inode number for a file?
Use <emailaddress>@locallyuniq. Every developer should have an email, right? :-)
> And then > how do you reconcile this when people on 2 different branches create > the same file and want to merge their versions together?
That's conflict, and user interaction is neccessary at this point.
Pavel -- Pavel Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need...
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |