Browsing Bosnian translation

1992.

To resolve the conflict, you must apply the correct tags to either the target
branch or the source branch as appropriate. Use "bzr tags --show-ids -d
SOURCE_URL" to see the tags in the source branch. If you want to make the
target branch's tags match the source branch, then in the target branch do
``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the
CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the source
branch. You need not call "bzr resolve" after doing this. To resolve in
favor of the target branch, you need to similarly use ``tag --force`` in the
source branch. (Note that pulling or pushing using --overwrite will overwrite
all tags as well.)