feat(Merge): Change merge strategy to recursive-theirs

kine · kine · commit 021cc90731e1 · 2017-06-22T10:05:10.000+02:00
This strategy will merge even chages in other folders and will prioritize
theirs changes in case of conflict
diff --git a/Scripts/NVR_NAVScripts/Merge-NAVGIT.ps1 b/Scripts/NVR_NAVScripts/Merge-NAVGIT.ps1
@@ -174,7 +174,7 @@ function Merge-NAVGIT
 
     function CreateGitMerge
     {
-        $result = git.exe merge --no-ff --no-commit --strategy=ours --quiet --no-progress $targetbranch | Out-Null
+        $result = git.exe merge --no-ff --no-commit --strategy=recursive --strategy-option=theirs --no-renames --quiet --no-progress $targetbranch | Out-Null
     }
 
     function ConvertTo-Date ($param1)

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ function Merge-NAVGIT`
`174`	`174`
`175`	`175`	`function CreateGitMerge`
`176`	`176`	`{`
`177`		`- $result = git.exe merge --no-ff --no-commit --strategy=ours --quiet --no-progress $targetbranch \| Out-Null`
	`177`	`+ $result = git.exe merge --no-ff --no-commit --strategy=recursive --strategy-option=theirs --no-renames --quiet --no-progress $targetbranch \| Out-Null`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`function ConvertTo-Date ($param1)`