Comment 6 for bug 93947

Just a minor poke at this issue ; encountered it today.

You have to manually delete the erroneous tag at the appropriate end, which is fine.

In my case, the tags were on revisions that were not part of the branch (having been on revisions that were uncommitted). Tags are a branch-level thing so this could potentially lead to tags on revisions that do not exist in the repository that you have. It would seem to be harmless to resolve conflicts like this by just ignoring the "dead" tag and replacing it.