From fa3df51973227d0ece392e2fa1db2750c768a6cb Mon Sep 17 00:00:00 2001
From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:41:54 -0500
Subject: [PATCH 1/2] fix: settings file imports before all else

---
 CHANGELOG.md                                           |  1 +
 .../Git/PullEventHandler/IncrementalLoad.cls           | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfd56512..6974fc40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed business processes and rules not being added to source control automatically (#676)
 - Embedded Git commits settings when cloning empty repo to avert any issues
 - Fixed Import All options not importing the Embedded Git configuration file
+- That configuration file now imports before everything else (#697)
 - Improved performance of IDE editing and baselining of decomposed productions
 - Fixed Discard / Stash not working on deletes (#688)
 
diff --git a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
index 5281f01d..be0c6683 100644
--- a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
+++ b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
@@ -10,6 +10,16 @@ Parameter DESCRIPTION = "Performs an incremental load and compile of all changes
 Method OnPull() As %Status
 {
     set sc = $$$OK
+
+    // certain items must be imported before everything else.
+    for i=1:1:$get(..ModifiedFiles) {
+        set internalName = ..ModifiedFiles(i).internalName
+        if internalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME {
+            set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName))
+        }
+    }
+    break
+
     set nFiles = 0
 
     for i=1:1:$get(..ModifiedFiles){

From a7fa732c3507f84d11f8684243a94ac3918cf8c4 Mon Sep 17 00:00:00 2001
From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com>
Date: Wed, 29 Jan 2025 12:07:03 -0500
Subject: [PATCH 2/2] fix: remove debugging statement

---
 cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
index be0c6683..a639b5c2 100644
--- a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
+++ b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
@@ -18,7 +18,6 @@ Method OnPull() As %Status
             set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName))
         }
     }
-    break
 
     set nFiles = 0