Merge pull request #34 from Sharpe49/ignore-whitespace-changes

twpol · web-flow · commit 658e22053876 · 2022-01-16T14:09:00.000Z
Changed merge parameters to ignore whitespace differences to make git merge more tolerant
diff --git a/Git/Project.cs b/Git/Project.cs
@@ -54,7 +54,7 @@ public void Clean()
 
         public void Merge(string reference)
         {
-            RunCommand($"merge --quiet --no-edit --no-ff {reference}");
+            RunCommand($"merge --quiet --no-edit --no-ff -Xignore-space-change {reference}");
         }
 
         public void Push(string reference)

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void Clean()`
`54`	`54`
`55`	`55`	`public void Merge(string reference)`
`56`	`56`	`{`
`57`		`- RunCommand($"merge --quiet --no-edit --no-ff {reference}");`
	`57`	`+ RunCommand($"merge --quiet --no-edit --no-ff -Xignore-space-change {reference}");`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public void Push(string reference)`