now commits before merge/rebase

isc-hwojnick · isc-hwojnick · commit d407e35eeb8d · 2024-06-24T13:43:20.000-04:00
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -419,8 +419,8 @@ ClassMethod Sync(Msg As %String) As %Status
     } else {
         do ..Fetch()
         do ..Pull()
-        do ..MergeDefaultMergeBranch()
         do ..SyncCommit(Msg)
+        do ..MergeDefaultRemoteBranch()
         do ..Push()
     }
     

Original file line number	Diff line number	Diff line change
`@@ -419,8 +419,8 @@ ClassMethod Sync(Msg As %String) As %Status`
`419`	`419`	`} else {`
`420`	`420`	`do ..Fetch()`
`421`	`421`	`do ..Pull()`
`422`		`- do ..MergeDefaultMergeBranch()`
`423`	`422`	`do ..SyncCommit(Msg)`
	`423`	`+ do ..MergeDefaultRemoteBranch()`
`424`	`424`	`do ..Push()`
`425`	`425`	`}`
`426`	`426`