Repository navigation
Document missing bundle dependencies during checkout and rebase - #936
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Document how an application
Gemfile.lockupdate can prevent Overcommit from loading after checkout and interrupt a rebase with a detached HEAD. Recommend installing the updated branch's dependencies before rebasing or using a separate hook Gemfile.Add recovery instructions for both an in-progress rebase and an early failure that leaves a detached HEAD without rebase state, plus a command to abort when hooks cannot load. The recovery recipe restarts an interrupted rebase because a failed commit hook can leave a partly replayed commit that
--continuealone cannot resolve.Reproduced with a real divergent-branch rebase and a lockfile requiring an uninstalled rake 13.0.6. Verified that installing the missing gem, aborting, and retrying completes successfully on the original branch. Current Git also encounters the missing bundle in
prepare-commit-msg, so suppressing only a post-checkout error would not resolve it. This addresses the documentation gap raised in the issue while keeping dependency errors visible.Validation: verified the reproduction and recovery in an isolated repository, checked the Markdown/source diff, and ran
git diff --check. No runtime code changes.Closes #760.