Jamie Webb wrote:
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.
In this case it was a bit of debug code that the developer forgot to remove when he created the patch. Just a few lines.
I think that kind of stuff is always going to happen. I agree with you that with you though that good communication among the team is the best defense against most of the ugly conflicts. But I can think of serveral instances in other projects where myself and another developer were working on the same bit of code to solve to different problems. No way to avoid it in that situation.
-- Richard A. Smith Bitworks, Inc _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
