pipeline(backport): use --strategy-option=theirs (#8767) (#8780)

hc-github-team-secure-vault-core · ryancragun · web-flow · commit 5d264c29e587 · 2025-08-20T23:25:07.000Z
Signed-off-by: Ryan Cragun &lt;me@ryan.ec&gt;
Co-authored-by: Ryan Cragun &lt;me@ryan.ec&gt;
diff --git a/tools/pipeline/internal/pkg/github/create_backport.go b/tools/pipeline/internal/pkg/github/create_backport.go
@@ -657,7 +657,7 @@ func (r *CreateBackportReq) backportRef(
 			Commit:   commitSHA,
 			Strategy: libgit.MergeStrategyORT,
 			StrategyOptions: []libgit.MergeStrategyOption{
-				libgit.MergeStrategyOptionOurs,
+				libgit.MergeStrategyOptionTheirs,
 				libgit.MergeStrategyOptionIgnoreSpaceChange,
 			},
 		})
