Darcs experts: question about conflicts

This is a discussion on Darcs experts: question about conflicts within the Tech Board forums, part of the Community Boards category; I installed Darcs a few days ago and have a doubt. I am the only programmer and I usually work ...

  1. #1
    Registered User
    Join Date
    Feb 2008
    Posts
    145

    Darcs experts: question about conflicts

    I installed Darcs a few days ago and have a doubt. I am the only programmer and I usually work on two or three instances of the application, making new feautures. The problems cames because this instances modify the same source code file, so when I finished them and send to main repository they make a conflict. Is there any way to deal with this? Can I write the same file in multiple instances without making conflict when pushing to main repository? Is there any best practice? thanks

  2. #2
    C++ Witch laserlight's Avatar
    Join Date
    Oct 2003
    Location
    Singapore
    Posts
    22,166
    You presumably would need to perform a manual merge to resolve the conflicts. If you want three distinct copies of the file, then that is a different matter.
    C + C++ Compiler: MinGW port of GCC
    Version Control System: Bazaar

    Look up a C++ Reference and learn How To Ask Questions The Smart Way

Popular pages Recent additions subscribe to a feed

Similar Threads

  1. Debugging question
    By o_0 in forum C Programming
    Replies: 9
    Last Post: 10-10-2004, 06:51 PM
  2. Question about pointers #2
    By maxhavoc in forum C++ Programming
    Replies: 28
    Last Post: 06-21-2004, 01:52 PM
  3. Question...
    By TechWins in forum A Brief History of Cprogramming.com
    Replies: 16
    Last Post: 07-28-2003, 10:47 PM
  4. opengl DC question
    By SAMSAM in forum Game Programming
    Replies: 6
    Last Post: 02-26-2003, 09:22 PM
  5. Question about linked lists.
    By cheeisme123 in forum C++ Programming
    Replies: 6
    Last Post: 02-25-2003, 01:36 PM

Tags for this Thread


1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21