intuit / intuit/auto

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

Open
#2,047 0 comments 0 reactions 0 assignees View on GitHub
bug
Dominant language
TypeScript
Stars
2.5k
Forks
221
PR merge metrics
No merged PRs in 30d

Description

**Describe the bug**

The [documentation](https://intuit.github.io/auto/docs/generated/shipit#prereleases) 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`)

- https://github.com/vega/vega-tooltip/commit/8ca292963c22ebc8699490313f11c05cdd7eb6d7

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

- https://github.com/vega/vega-tooltip/blob/b815153965f6f23d0240c99abf18ee86cbdc81e6/package.json#L3

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

Contributor guide

No contributing guide indexed for this repository

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.