Skip to content

sync: Skip if no rebase needed #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfoch merged 1 commit into from
Jun 6, 2025
Merged

sync: Skip if no rebase needed #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion guw/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down