Merge pull request #24 from fluendo/fix-no-rebase

sync: Skip if no rebase needed

Author: cfoch

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