fix(MORG-48): sync without checking out branches#37
Merged
developerdavi merged 1 commit intomainfrom Mar 9, 2026
Merged
Conversation
Use `git fetch origin main:main` to update the local default branch ref without checkout. For non-current branches in --all mode, run rebase/merge in their worktree directory (via cwd) instead of switching to them; branches without a worktree are skipped with a message to switch manually.
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.
Closes MORG-48
Summary
git fetch origin main:main(via the existingfetchAndUpdateBranchhelper) instead ofcheckout → pull → checkout. This updates the local branch ref without switching to it.cwd: branch.worktreePathtorebaseBranch/mergeBranchso git operates in the right directory. For non-current branches without a worktree, skips with an informational message ("switch to it to update").rebaseBranchandmergeBranchingit/index.tseach gain an optionalcwdparameter to enable the above.What's unchanged
Test plan
morg syncfrom a feature branch — should pull latestmainwithout ever switching tomainmorg sync --allwith multiple active branches that have worktrees — rebase/merge runs in each worktree's directory, user stays on current branchmorg sync --allwith a non-current branch that has no worktree — shows "switch to it to update" message and skipsmorg syncwhen current branch is deleted during sync — correctly checks out default branch (exception case)pnpm test)