diff --git a/pre_merge.sh b/pre_merge.sh
index e0f3d8ae74..79e37d7659 100755
--- a/pre_merge.sh
+++ b/pre_merge.sh
@@ -13,7 +13,7 @@ versionMajor=`get_prop ext.versionMajor`
 versionMinor=`get_prop ext.versionMinor`
 versionPatch=`get_prop ext.versionPatch`
 tag="sc_last_v$versionMajor.$versionMinor.$versionPatch"
-git tag "$tag"
+git tag "$tag" || true
 
 # Revert Schildi's upstream string changes
 git checkout `upstream_common_base` -- "$mydir/library/ui-strings/src/main/res/**/strings.xml"