sync: switch to child or available branch in worktree before deleting branch#5798
Merged
sync: switch to child or available branch in worktree before deleting branch#5798
Conversation
…untime.go branch_with_remote_gone_delete_if_empty_at_runtime.go checkout_parent_or_main.go
…ckout_parent_or_main.go
…t_child_or_other.go
….feature ancestor_with_multiple_descendents_shipped.feature shipped_changes_conflict_with_existing_feature_branch.feature preserve_git_history.feature cli_flag.feature
…ranches.feature in_sync.feature verbose.feature
…d.feature dependent_ancestor_shipped_and_related_change_on_main.feature dependent_ancestor_shipped_and_unrelated_change_on_main.feature independent_ancestors_shipped.feature parent_shipped.feature parent_deleted_grandchild_conflict.feature dependent_ancestor_shipped.feature dependent_ancestor_shipped_and_main_unrelated_updated.feature dependent_ancestor_shipped_and_main_updates_same_location.feature independent_ancestors_shipped.feature parent_deleted_grandchild_conflicts.feature parent_shipped.feature auto_resolve.feature no_auto_resolve_cli.feature no_auto_resolve_config.feature enabled.feature
…descendents_shipped.feature shipped_changes_conflict_with_existing_feature_branch.feature preserve_git_history.feature cli_flag.feature
…descendents_shipped.feature shipped_changes_conflict_with_existing_feature_branch.feature cli_flag.feature
…ranches.feature in_sync.feature verbose.feature cli_flag.feature happy_path.feature verbose.feature happy_path.feature verbose.feature dependent_ancestor_shipped.feature dependent_ancestor_shipped_and_related_change_on_main.feature dependent_ancestor_shipped_and_unrelated_change_on_main.feature independent_ancestors_shipped.feature parent_shipped.feature parent_deleted_grandchild_conflict.feature dependent_ancestor_shipped.feature dependent_ancestor_shipped_and_main_unrelated_updated.feature dependent_ancestor_shipped_and_main_updates_same_location.feature independent_ancestors_shipped.feature parent_deleted_grandchild_conflicts.feature parent_shipped.feature auto_resolve.feature no_auto_resolve_cli.feature no_auto_resolve_config.feature enabled.feature
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
…descendents_shipped.feature cli_flag.feature ancestor_with_multiple_descendents_shipped.feature cli_flag.feature dependent_ancestor_shipped.feature dependent_ancestor_shipped_and_related_change_on_main.feature dependent_ancestor_shipped_and_unrelated_change_on_main.feature independent_ancestors_shipped.feature parent_shipped.feature parent_deleted_grandchild_conflict.feature dependent_ancestor_shipped.feature dependent_ancestor_shipped_and_main_unrelated_updated.feature dependent_ancestor_shipped_and_main_updates_same_location.feature independent_ancestors_shipped.feature parent_deleted_grandchild_conflicts.feature parent_shipped.feature auto_resolve.feature no_auto_resolve_cli.feature no_auto_resolve_config.feature enabled.feature
…descendents_shipped.feature shipped_changes_conflict_with_existing_feature_branch.feature preserve_git_history.feature ancestor_with_multiple_descendents_shipped.feature verbose.feature verbose.feature verbose.feature dependent_ancestor_shipped.feature dependent_ancestor_shipped_and_related_change_on_main.feature dependent_ancestor_shipped_and_unrelated_change_on_main.feature independent_ancestors_shipped.feature parent_shipped.feature parent_deleted_grandchild_conflict.feature dependent_ancestor_shipped.feature dependent_ancestor_shipped_and_main_unrelated_updated.feature dependent_ancestor_shipped_and_main_updates_same_location.feature independent_ancestors_shipped.feature parent_deleted_grandchild_conflicts.feature parent_shipped.feature auto_resolve.feature no_auto_resolve_cli.feature no_auto_resolve_config.feature enabled.feature sync_deleted_branch.go all.go branch_delete_if_empty_at_runtime.go branch_with_remote_gone_delete_if_empty_at_runtime.go checkout_child_or_other_if_needed.go
…anch_with_remote_gone_delete_if_empty_at_runtime.go checkout_child_or_other_if_needed.go
…anch_with_remote_gone_delete_if_empty_at_runtime.go checkout_descendent_or_other.go checkout_descendent_or_other_if_needed.go
kevgo
force-pushed
the
kg-sync-prune-main-other-worktree
branch
from
2b5d5bd to
a59c604
Compare
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.
resolves #5797