feat(MORG-26): rework sync flow — always pull, PR sync before deletion, --all flag - #18
Merged
Merged
Conversation
…n, --all flag New order: pull default branch (always, no prompt) → sync PR statuses for all branches → delete merged branches → offer rebase/merge for current branch only (or all branches with --all). Merged branches are now cleaned up before the update step, so you never get prompted to update a branch that's about to be deleted. If the current branch is merged it is deleted and the working tree switches to the default branch before continuing.
syncPull was only consumed by morg sync, which now always pulls the default branch unconditionally. Remove the field from GlobalConfig, ProjectConfig, morg config prompts/display, and morg init.
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.
Closes MORG-26
New sync flow
autoDeleteMergedconfig); if the current branch is merged, switches to the default branch first--allflag extends this to all active branchesKey changes
syncPullprompt — pull always runs--allflag:morg sync --allto rebase/merge all active branches instead of just the current one