Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support remotely shipped nested branches #2037

Closed
kevgo opened this issue Jan 28, 2023 · 3 comments
Closed

support remotely shipped nested branches #2037

kevgo opened this issue Jan 28, 2023 · 3 comments
Milestone

Comments

@kevgo
Copy link
Contributor

kevgo commented Jan 28, 2023

I have nested feature branches:

main
 \
  feature1
   \
    feature2

Git Town knows the branch hierarchy.

I submit a PR for feature1, the maintainer merges my MR and deletes the branch on the remote.

On the next sync, Git Town should update feature2 to have the parent main.

@wederbrand
Copy link

I came here to say that this is exactly my workflow and a much wanted feature.

@ruudk
Copy link
Contributor

ruudk commented Oct 20, 2023

This would also allow the PR author to merge its own PR on the GitHub interface, without having to use ship.

@kevgo kevgo added this to the v10 milestone Oct 23, 2023
@kevgo
Copy link
Contributor Author

kevgo commented Oct 23, 2023

This should work in the upcoming v10 release: https://github.com/git-town/git-town/blob/main/features/sync/current_branch/feature_branch/tracking_branch_deleted/features/multiple_ancestors_shipped.feature

@kevgo kevgo closed this as completed Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

No branches or pull requests

3 participants