mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
If another git process takes index.lock while a rebase is replaying commits, git stops the rebase and reschedules the todo that failed. The git command runner then ran the whole "git rebase --interactive" command again. This failed because the rebase was already in progress, and the user was left with a rebase that stopped halfway. Continue the rebase with "git rebase --continue" instead; this runs the rescheduled todo again. Only do this if the todo files show that git rescheduled it. In some cases git doesn't, for example if the lock stops a pick after it has applied the changes but before it has committed them. Continuing is not safe in that case, so give up and show the error. If the lock stops the command before the rebase starts, git cleans up after itself, and we run the command again as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>