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

[question]: Best practices for synchronizing versions in a two-branch prerelease workflow #2047

Open
hydrosquall opened this issue Aug 3, 2021 · 0 comments
Labels
bug Something isn't working

Comments

@hydrosquall
Copy link
Contributor

hydrosquall commented Aug 3, 2021

Describe the bug

The documentation for auto shipit recommends

To update the latest stable version simply merge your pre-release branch into your baseBranch.

A downside to this approach is that your long-lived prerelease will not have its version bumped, so it is now behind the stable branch.

(For example: This commit was created on stable)

However, it was not applied to our long-lived pre-release branch, next, so our pre-release branch is now behind.

Which would be the recommended way to keep a perpetual "prerelease" branches in sync with stable?

  1. Manually create an additional PR after merging next -> stable to synchronize the versions in both places
  2. Any time after next -> stable is merged, manually reset next to the head of stable
  3. Come up with some sort of custom plugin to synchronize the branches automatically
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant