[darcs-devel] Conflicts...?

[William Uther]

Hi all,

   It's been a while since I've looked at DARCS (I've been playing  
with Monotone...).  Anyway, last time I was here DARCS was having  
problems with conflicts and you were looking for a solution.  Reading http://wiki.darcs.net/index.html/ConflictsFAQ 
  it sounds like you've found one.  I tried searching the archives,  
and I found a lot of discussion, but it was hard to find what the  
final solution was (there seemed to be a bunch of options and it isn't  
clear which one was chosen and what its final form was).

   Are there any pointers to a description of the final solution  
anywhere?

Thanks,

Will          :-}