On Tue, Nov 08, 2005 at 11:36:06AM +0900, Stephen J. Turnbull wrote: > Jamie> And of course the best approach is to communicate with the > Jamie> rest of the team and avoid the conflicts in the first place > Jamie> :-). > > I think that's arguable. What's the point of an advanced distributed > SCM if you're going to insist that people serialize their work to > avoid conflicts?
Because conflicts are the Enemy. Darcs gets to call itself 'advanced' precisely because it's better at avoiding conflicts than any onther SCM, due to the patch theory. But once they do occur, it fares no better than CVS (worse, in fact). So, if a little bit of chat can reduce them further, I think it must be a good thing. It doesn't need to be anything so extreme as re-inventing file checkouts; we've pretty much eliminated conflicts just by maintaining a general idea of what other people are up to. Certainly that's easier with a team largely based in a single office, but it doesn't seem impossible to do with distributed projects. -- Jamie Webb _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
