now pushes before merge

isc-hwojnick · isc-hwojnick · commit 1b3401be1253 · 2024-06-25T08:49:07.000-04:00
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -420,8 +420,9 @@ ClassMethod Sync(Msg As %String) As %Status
         do ..Fetch()
         do ..Pull()
         do ..SyncCommit(Msg)
-        do ..MergeDefaultRemoteBranch()
         do ..Push()
+        do ..MergeDefaultRemoteBranch()
+        
     }
     
     quit $$$OK
