Update ProductionConflictResolver.cls

isc-tleavitt · isc-tleavitt · commit 47b1a450d516 · 2024-07-02T10:52:50.000-04:00
diff --git a/cls/SourceControl/Git/Util/ProductionConflictResolver.cls b/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
@@ -86,7 +86,7 @@ Method Resolve() [ Private ]
     if (code '= 0) {
         $$$ThrowStatus($$$ERROR($$$GeneralError,"git add reported failure"))
     }
-    set code = ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "commit", "-m", "Auto-resolved conflict on production class")
+    set code = ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "commit", "--no-edit")
     if (code '= 0) {
         $$$ThrowStatus($$$ERROR($$$GeneralError,"git commit reported failure"))
     }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ Method Resolve() [ Private ]`
`86`	`86`	`if (code '= 0) {`
`87`	`87`	`$$$ThrowStatus($$$ERROR($$$GeneralError,"git add reported failure"))`
`88`	`88`	`}`
`89`		`- set code = ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "commit", "-m", "Auto-resolved conflict on production class")`
	`89`	`+ set code = ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "commit", "--no-edit")`
`90`	`90`	`if (code '= 0) {`
`91`	`91`	`$$$ThrowStatus($$$ERROR($$$GeneralError,"git commit reported failure"))`
`92`	`92`	`}`