I have problem conflict in new files. A project have two branches, a file created in each repository with a same name. When using "darcs pull" without external merger, one version of the new file will lost. I cannot find which version will lost. Sometimes the local file are overwritten, but sometimes the remote file cannot be pulled. No matter which situration, I cannot get both version, so resolving conflict become impossible. When external merger is used, the file is simple deleted!
I think it should be a bug. If it does not, I want to ask how to solve the problem. Thx PS:My version is 1.0.3 in FreeBSD ports _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
