Make rebasing working with worktrees + other local checkouts#119
Open
drisspg wants to merge 1 commit intomodular:mainfrom
Open
Make rebasing working with worktrees + other local checkouts#119drisspg wants to merge 1 commit intomodular:mainfrom
drisspg wants to merge 1 commit intomodular:mainfrom
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
1 participant
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.
Summary
Worked on this with 5.4 but basically I found when I have a main checkout + worktree, if I create a series of commits on a worktree and then run sp land, it lands the pr but fails to rebase because also tried to rebase the local target branch (for example main), even when that branch was checked out in another worktree. This changes land to skip rebasing local branch not owned by worktree and lets them be rebased individually.