From 0636d3a4dc38fd59ce820c5c750457260618ddaf Mon Sep 17 00:00:00 2001
From: Fabian Orccon <cfoch.fabian@gmail.com>
Date: Fri, 6 Jun 2025 09:47:07 +0200
Subject: [PATCH] sync: Skip if no rebase needed

---
 guw/main.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guw/main.py b/guw/main.py
index 4ed433a..378b723 100644
--- a/guw/main.py
+++ b/guw/main.py
@@ -185,7 +185,10 @@ def _sync_at(self, tmpdir, backup, local, features, prev_feature, interactive):
                     print("    paused to fix conflicts")
                     input("    press a key when rebases ready and 'git rebase --continue' will be execute...")
                     os.environ["GIT_EDITOR"] = "true"
-                    repo.git.rebase("--continue")
+                    try:
+                        repo.git.rebase("--continue")
+                    except git.exc.GitCommandError as e:
+                        logger.warning(f"`git rebase --continue` failed — possibly nothing to rebase. Error: {e}")
 
                 prev_active_feature = feature
                 prev_feature = feature