Ensure local main branch is updated

TA-Lib · Nov 20, 2024 · 5f1c435 · 5f1c435
1 parent fdb5322
commit 5f1c435
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scripts/sync.py b/scripts/sync.py
@@ -53,9 +53,14 @@ def main():
                 print("4. Complete merge with a 'git commit'")
                 sys.exit(1)
 
-        # Find the common ancestor of dev and main
+        # Ensure the local main branch is up-to-date
+        run_command(['git', 'checkout', 'main'])
         run_command(['git', 'pull', 'origin', 'main'])
 
+        # Switch back to dev branch
+        run_command(['git', 'checkout', 'dev'])
+
+        # Find the common ancestor of dev and main
         merge_base = run_command(['git', 'merge-base', 'dev', 'main'])
 
         # Check if there are any changes from main that are not in dev