Use -X theirs instead of -s theirs which doesn't exist

Perksey · Perksey · commit 412df6000a42 · 2022-01-05T13:47:08.000Z
diff --git a/build/nuke/Build.Native.cs b/build/nuke/Build.Native.cs
@@ -269,7 +269,7 @@ void PrUpdatedNativeBinary(string name)
                     Git($"checkout -b \"{newBranch}\"");
                 }
 
-                Git($"merge -s theirs \"{curBranch}\"");
+                Git($"merge -X theirs \"{curBranch}\"");
                 Git($"push --set-upstream origin \"{newBranch}\"");
                 if (!exists)
                 {

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ void PrUpdatedNativeBinary(string name)`
`269`	`269`	`Git($"checkout -b \"{newBranch}\"");`
`270`	`270`	`}`
`271`	`271`
`272`		`- Git($"merge -s theirs \"{curBranch}\"");`
	`272`	`+ Git($"merge -X theirs \"{curBranch}\"");`
`273`	`273`	`Git($"push --set-upstream origin \"{newBranch}\"");`
`274`	`274`	`if (!exists)`
`275`	`275`	`{`