fix(MORG-52): avoid checkout to base when starting from a worktree branch#44
Merged
developerdavi merged 1 commit intomainfrom Mar 10, 2026
Merged
fix(MORG-52): avoid checkout to base when starting from a worktree branch#44developerdavi merged 1 commit intomainfrom
developerdavi merged 1 commit intomainfrom
Conversation
…tree When on a worktree branch and running `morg start <new>`, the previous code tried to `git checkout <base>` which fails because the base is already checked out in the main worktree. Use `fetchAndUpdateBranch(base)` to update the local ref without checking out, then create the new branch explicitly from that ref via `checkout(name, true, base)`.
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.
Ticket
MORG-52: Can't start a new branch from a worktree branch
Summary
morg start <new>was trying togit checkout mainbefore creating the new branch — this fails becausemainis already checked out in the main worktreesync.ts): usefetchAndUpdateBranch(base)to update the local ref without any checkoutcheckout(name, true, base)→git checkout -b name base, so it always starts from the correct base ref regardless of which branch is currently activeTest plan
morg start <new-branch>— should create the branch without trying to checkout mainmorg start <new>still pulls main then creates the branch as before