unsolvable merging conflict

Hello,

I made a new branch a few days a go, and when trying to merge changes I
get a (I think) strange problem.

$ svn merge svn+ssh://.../svnrepos/trunk/cfmud
--- Merging r2 through r94 into '.':
    C area
Summary of conflicts:
   Tree conflicts: 1

First strange thing is that I added this directory before branching, so
I don't understand why subversion complains about it.
Anyway, I proceed with:

$ svn resolve --accept=working area
Resolved conflicted state of 'area'
$ svn commit -m "merged"
$ svn update
At revision 94.
$ svn merge svn+ssh://.../svnrepos/trunk/cfmud
--- Merging r2 through r94 into '.':
    C area
Summary of conflicts:
   Tree conflicts: 1

Changes are supposed to be already merged, so why it merges all
revisions again? And, how can I resolve this conflict definitively?

Thank you in advance for your help.

Regards,

Joan
Received on 2010-08-31 14:25:50 CEST