From c58f2545de22475a8fc8ba1d753ef4bcc54f3c34 Mon Sep 17 00:00:00 2001
From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com>
Date: Tue, 1 Oct 2024 11:53:18 -0400
Subject: [PATCH 1/2] fix: rebasing from remote loads code changed on the
 remote we now diff the old head with the new head. before we diffed the
 remote branch with the new head, which misses all the changes made on the
 remote branch.

---
 cls/SourceControl/Git/Utils.cls | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index 5d03552..94d8530 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -440,7 +440,7 @@ ClassMethod MergeDefaultRemoteBranch(Output alert As %String = "") As %Boolean
         do ..RunGitWithArgs(.errStream, .outStream, "fetch", "origin", defaultMergeBranch_":"_defaultMergeBranch)
         do ..PrintStreams(errStream, outStream)
 
-        do ..RunGitWithArgs(,.outStream, "rev-parse", defaultMergeBranch)
+        do ..RunGitWithArgs(,.outStream, "rev-parse", "HEAD")
         set startSha = outStream.ReadLine()
 
         // Start a transaction so code changes can be rolled back
@@ -2693,4 +2693,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
-

From 80cbea0cbb1f1f93852e88d553a5b2e233d18f7e Mon Sep 17 00:00:00 2001
From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:27:32 -0400
Subject: [PATCH 2/2] updated changelog for fix rebase sync

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02f0c16..c3bd606 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,14 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added 
 - Files in uncommitted queue in any namespace warn users when opened except for in VSCode (#370)
-
-### Added
 - Added link back to IRIS management portal from Settings, Git WebUI pages (#449)
 
 ### Fixed
 - Changed prompts in configure from 0/1 to no/yes (#461)
 - Added warnings when user is using incompatible git version (#488)
 - Fixed the back button navigation between WebUI and Settings page (#361)
+- Basic mode Sync operation now imports items changed on the remote merge branch (#506)
 
 ## [2.5.0] - 2024-09-24