Merge pull request #803 from raymond-rebbeck/fix-pull-diff-direction

When performing a pull set diffBase so that the diff to sync files with IRIS is performed in the intended direction

Author: isc-pbarton

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed importing Lookup Tables that do not already exist (#791)
+- Fixed syncing IRIS with files after pull to diff in the intended direction (#802)
 
 ## [2.12.1] - 2025-06-27
 

cls/SourceControl/Git/Utils.cls

@@ -1912,7 +1912,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
         // Verbose output should not be required as pull already outputs a summary
         set syncIrisWithDiffVerbose = 0
         // The current revision, prior to the pull, will be compared against
-        set diffCompare = ..GetCurrentRevision()
+        set diffBase = ..GetCurrentRevision()
     } elseif (command = "merge") || (command = "rebase") {
         set syncIrisWithCommand = 1
         if $data(args) && $data(args(args),diffCompare) {