Hi, I have a repo that contains conflicting patches. When one of these was pulled in, darcs marked the conflict. I resolved it, and recorded the new patch. Unfortunately, when I do 'darcs resolve', the conflict is still there, and gets marked anew.
Is there a standard way to deal with this? (Repo is http://www.ii.uib.no/~ketil/src/fps) -k -- If I haven't seen further, it is by standing in the footprints of giants _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
