rpmgs: drop 'ours' merge strategy that broke merging vendored sources

The -s ours strategy discarded the merged tag content, so packages with vendored sources were not actually merged into master. Use a regular merge for all packages. Reverts d223e6ca.

rpmgs: drop 'ours' merge strategy that broke merging vendored sources
bd83b595 · Vitaly Lipatov · 6816917e · bd83b595
Commit bd83b595 authored Jun 29, 2026 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

rpmgs bin/rpmgs +1 -6

No files found.
--- a/bin/rpmgs
+++ b/bin/rpmgs
@@ -469,12 +469,7 @@ update_master_branch_to()

 	local tag="$(get_tag_by_version "$GSSETVERSION")"
 	[ -n "$tag" ] || fatal "Can't find tag for $GSSETVERSION version"
-	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 || fatal "Failed to merge tag $tag (ours strategy)"
-	else
-		docmd git merge $tag || fatal "Failed to merge tag $tag. Try 'git merge --allow-unrelated-histories $tag' manually."
-	fi
+	docmd git merge $tag || fatal "Failed to merge tag $tag. Try 'git merge --allow-unrelated-histories $tag' manually."

 	# TODO: it is more clean detect that dir
 	if [ -d "$(get_root_git_dir)/.gear/tags" ] ; then