> If it is a file, you can AFAIK safely remove the mergeinfo property from the > file .
Thanks, it is a file. I have removed the property in the trunk. I then merged the trunk into my branch whereupon I got a conflict for that file. So I just deleted the mergeinfo property in the branch, marked the file as resolved and committed the branch. Not sure if that was the right thing to do. It may reoccur next time I merge, I guess. David
