Hello and welcome to our community! Is this your first visit?
Register
Enjoy an ad free experience by logging in. Not a member yet? Register.
Results 1 to 3 of 3
  1. #1
    UE Antagonizer Fumigator's Avatar
    Join Date
    Dec 2005
    Location
    Utah, USA, Northwestern hemisphere, Earth, Solar System, Milky Way Galaxy, Alpha Quadrant
    Posts
    7,691
    Thanks
    42
    Thanked 637 Times in 625 Posts

    distributed version control

    I suppose this is the best forum for this question...

    I'm considering using a Distributed Version Control System such as Bazaar 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.

  • #2
    Rockstar Coder
    Join Date
    Jun 2002
    Location
    USA
    Posts
    9,074
    Thanks
    1
    Thanked 328 Times in 324 Posts
    While I saw your thread yesterday, I've only worked with centralized version control so I don't know.

    But I am curious though why you decided to go with a distributed version control system?
    OracleGuy

  • #3
    UE Antagonizer Fumigator's Avatar
    Join Date
    Dec 2005
    Location
    Utah, USA, Northwestern hemisphere, Earth, Solar System, Milky Way Galaxy, Alpha Quadrant
    Posts
    7,691
    Thanks
    42
    Thanked 637 Times in 625 Posts
    I suppose that is a good question. The pros and cons list suggests DVC promotes more collaboration between developers, and touts it as "the next generation". The concept is very abstract though, and if I can't get comfortable with how it merges changes, I'll probably scrap it and go with a centralized VCS.


  •  

    Posting Permissions

    • You may not post new threads
    • You may not post replies
    • You may not post attachments
    • You may not edit your posts
    •