releases: what is merged where and when ? #8358
Merged
Conversation
This file contains 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
|
@jdurgin I tried to write down what I understand in a way that could be used as a reference by others. I have no clue if it's actually understandable or just even more confusing :-) What do you think ? |
|
@smithfarm does it make sense to you ? |
| What is merged where and when ? | ||
| =============================== | ||
|
|
||
| Commits are merged into branches according to criterions that change |
|
@jdurgin @smithfarm pushed the requested changes in "squash me" for easier review |
ghost
changed the title
| v10.0.5 | ||
| ======= | ||
|
|
||
| This is identical to v10.0.4 and was only created because of a git tagging mistake. |
|
Added a "Branch merge" section in an attempt to answer the FAQ : "is branch X going to be merged with branch Z" ? cdfbeed |
|
I think this describes the current state well. @liewegas any branching changes you want to make before documenting this? |
| ^^^^^^^^^^^^^ | ||
|
|
||
| * The branch of the stable release is merged periodically into master. | ||
| * The master branch is merged periodically into the branch of the stable release. |
There was a problem hiding this comment.
could add that master is merged into the named branch immediately after each development x.0.z release.
|
the rest lgtm! |
Signed-off-by: Loic Dachary <loic@dachary.org>
Signed-off-by: Loic Dachary <loic@dachary.org>
Signed-off-by: Loic Dachary <loic@dachary.org>
ghost
changed the title
ghost
merged commit
This pull request was closed.
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.
No description provided.