[darcs-users] handling of conflicts?

Andres Loeh andres at cs.uu.nl
Mon Mar 22 11:27:34 UTC 2004


I've done the following.

~ $ mkdir darcs.1 && mkdir darcs.2
~ $ cd darcs.1
~/darcs.1 $ darcs inittree
~/darcs.1 $ echo "foo" > test
~/darcs.1 $ darcs record --look-for-adds
               { I record the changes as patch "foo" }
~ $ cd ../darcs.2
~/darcs.2 $ darcs inittree
~/darcs.2 $ echo "bar" > test
~/darcs.2 $ darcs record --look-for-adds
               { I record the changes as patch "bar" }
~/darcs.2 $ darcs pull ../darcs.1
Pulling from ../darcs.1...

Mon Mar 22 12:23:08 CET 2004  andres at cs.uu.nl
  * foo
Shall I pull this patch? [ynWvqdjk?] y
So far so good... finished merging.
We have conflicts in the following files:
./test
Finished pulling.
~/darcs.2 $ cat test
bar
~/darcs.2 $ darcs whatsnew
No changes!



More information about the darcs-users mailing list