From f11bd7ce0e6b0ef0045ff5342e338a8eabdea7fa Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Tue, 7 Apr 2026 12:45:10 +0530
Subject: [PATCH 1/2] fix: reset SDK dev branch to base branch before pushing

The dev branch was being reset to origin/dev, which retains stale
commits after squash merges. This caused recurring merge conflicts
and inflated PR diffs. Using `checkout -B dev <baseBranch>` ensures
dev always starts fresh from the default branch.
---
 src/Appwrite/Platform/Tasks/SDKs.php | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
index e8a69afddb..02ee97fc54 100644
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -639,29 +639,15 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
             } catch (\Throwable) {
             }
 
-            // Checkout dev branch (or create if it doesn't exist)
+            // Create or checkout dev branch from the base branch
+            // This ensures dev always starts from the latest base branch,
+            // avoiding history divergence caused by squash merges.
             try {
-                $repo->execute('checkout', '-f', $gitBranch);
+                $repo->execute('checkout', '-B', $gitBranch, $repoBranch);
             } catch (\Throwable) {
                 $repo->execute('checkout', '-b', $gitBranch);
             }
 
-            // Fetch dev branch, or push to create it on remote
-            try {
-                $repo->execute('fetch', 'origin', $gitBranch, '--quiet', '--no-tags', '--depth', '1');
-            } catch (\Throwable) {
-                try {
-                    $repo->execute('push', '-u', 'origin', $gitBranch, '--quiet');
-                } catch (\Throwable) {
-                }
-            }
-
-            // Sync with remote dev branch
-            try {
-                $repo->execute('reset', '--hard', "origin/{$gitBranch}");
-            } catch (\Throwable) {
-            }
-
             // Backup .github before cleaning working tree
             $githubDir = $target . '/.github';
             $githubBackup = \sys_get_temp_dir() . '/.github-backup-' . \getmypid();

From 7864a5b9d10c85720be68a86c3618552ba149430 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Tue, 7 Apr 2026 12:52:09 +0530
Subject: [PATCH 2/2] fix: use --force-with-lease on SDK dev branch push

After resetting dev to the base branch, the remote dev may have
diverged history from squash merges. A plain push would be rejected
as non-fast-forward. Using --force-with-lease safely overwrites
the remote since we just fetched.
---
 src/Appwrite/Platform/Tasks/SDKs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
index 02ee97fc54..4725f4095f 100644
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -685,7 +685,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                 return true;
             }
 
-            $repo->execute('push', '-u', 'origin', $gitBranch, '--quiet');
+            $repo->execute('push', '--force-with-lease', '-u', 'origin', $gitBranch, '--quiet');
         } catch (\Throwable $e) {
             Console::warning("  Git push failed: " . $e->getMessage());
             return false;