git-replay
git-replay copied to clipboard
[continue] in rare conflict situations, replay reports "Cannot continue" when --skip is the fix
Have hit this rarely, possibly related to (rename/delete)
conflicts.
git replay
# conflict
# resolve conflicts
git replay --continue
# snip
Cannot continue
~Issue may be git replay --continue
not correctly removing rebase-continue
from .git/replay/git-replay-todos
~
edit: no that's expected. maybe the issue is from running e.g. git rebase --continue
instead of git replay --continue
? --continue might need to learn to check to see if the ongoing action was finished outside of git-replay and silently --skip if so.
% cat .git/replay/git-replay-todos | head -1
rebase-continue <the rebase that conflicted but was then resolved and continued>