One or more conflicts were produced during previous merge

Hi,

upon attempting to merge from trunk into a branch subclipse is giving me 
the message


Unresolved conflicts from previous merge detected

One or more conflicts were produced during previous merge of <Name of 
the project to merge>

Resolve all conflicts and rerun the merge to apply the remaining 
unmerged revisions


Unfortumately there are no conflicts to resolve.

I had to merge using TortoiseSVN, which does the job without any complaints.

This has hit me several times by now and I find that behavior quite 
annoying!

What's wrong here?

Thanks and regards,
Dirk

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3068494

To unsubscribe from this discussion, e-mail: [[email protected]].