Comment 1 for bug 93947

The same is true for pulling as well. In this case isn't such a big deal as the tag could be explicitly removed locally, but it'd still be nice to have a flag to force local tags to be replaced on conflicts.