Fumigator
11-10-2008, 10:57 PM
I suppose this is the best forum for this question...
I'm considering using a Distributed Version Control System such as Bazaar (http://bazaar-vcs.org/) for a project where there will be 2 to 5 developers contributing code to.
If any of you reading this have experience with a DVCS, can you answer me one simple question? Since there is not a central repository, how are conflicts handled when two developers attempt to check in the same file with different modifications in it? I've read a lot about how vital the "merge" process is, but i still don't really understand how this sort of thing is handled.
I'm considering using a Distributed Version Control System such as Bazaar (http://bazaar-vcs.org/) for a project where there will be 2 to 5 developers contributing code to.
If any of you reading this have experience with a DVCS, can you answer me one simple question? Since there is not a central repository, how are conflicts handled when two developers attempt to check in the same file with different modifications in it? I've read a lot about how vital the "merge" process is, but i still don't really understand how this sort of thing is handled.