-
-
Notifications
You must be signed in to change notification settings - Fork 291
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
Edgecase in release process #4173
Comments
We have discussed this before, I would not merge stable back into unstable. Just archive old release tracks. |
We recently changed our release process specifically to address the shortcoming(?) that release tracks were not merged back into unstable. @dapplion But if we don't merge back to unstable, we would just need to figure out / document how / when to bump the versions in package.jsons.
|
Fixed the conflicts and merged stable into unstable here 2eeb965 I disabled branch protections temporarily to do the push |
Is your feature request related to a problem? Please describe.
During the release of v0.38.1, some issues arose.
stable
, built off changes from other PRsstable
(branchrc/v0.38.1
) required fixing merge conflictsstable
back tounstable
due to merge conflicts - see Stable #4172stable
cannot be modified to fix the conflicts, it is ridiculous to modifyunstable
to fix the conflictsDescribe the solution you'd like
stable
tounstable
on major / non-hotfix releasesThe text was updated successfully, but these errors were encountered: