Changelog and branch merging #281
jkbhagatio
started this conversation in
General
Replies: 2 comments
-
Can you have releases per branch? I.e. releases that reference a branch maybe in the release name/tag? |
Beta Was this translation helpful? Give feedback.
0 replies
-
We've agreed to:
still considering whether or not to do 'prod' branches for "main" exp branches |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Previously, we discussed the idea of, for all 'aeon' repos, adhering to updating the changelog for every merge into 'main', and a squashed-rebased version of this merge into 'prod'. The 'prod' branch serves as a more readable, abridged version of the full history that makes up 'main'.
For 'aeon_experiments' this becomes tricky, given that we've moved away from the standard of having one 'main' branch in this repo, and instead have one 'main' branch per experiment in this repo, where the 'main' branch for an experiment is actually just the experiment name.
One option for this going forward is not to have 'prod' branches in 'aeon_experiments', but simply have auto-generated releases with auto- (+ optional manual-) generated changelog updates for every experiment branch.
Another option is to do this and still keep the notion of 'prod' branches.
Beta Was this translation helpful? Give feedback.
All reactions