rpmgs: use 'ours' merge strategy for .gear/tags-based packages

bin/rpmgs

@@ -409,7 +409,12 @@ update_master_branch_to()
 
 	local tag="$(get_tag_by_version "$GSSETVERSION")"
 	[ -n "$tag" ] || fatal "Can't find tag for $GSSETVERSION version"
-	docmd git merge $tag
+	if [ -d "$(get_root_git_dir)/.gear/tags" ] ; then
+		info "Using 'ours' merge strategy for .gear/tags-based package"
+		docmd git merge -s ours $tag
+	else
+		docmd git merge $tag
+	fi
 
 	# TODO: it is more clean detect that dir
 	if [ -d "$(get_root_git_dir)/.gear/tags" ] ; then