Repository navigation
Merge main back into develop during release - #2
Merged
Merged
Conversation
Add a release workflow step between tag creation and the develop version bump that merges main into develop, so the release merge commit is part of develop's history. The step is skipped when main is already an ancestor of develop, keeping re-runs idempotent. CONTRIBUTING.md documents the new step and a verification check.
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
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.
Adds a
Merge main back into developstep torelease.yml, after the tag is pushed and before the develop version bump. Without it, each release leaves itsdevelop → mainmerge commit only onmain(a3c75f1anda508916were stranded this way).mainis already an ancestor ofdevelop, so re-runs stay idempotent.CONTRIBUTING.mdlists the new step and adds a verification check.Untested end to end; the next release run exercises it.