Update branching process in release guidelines #294
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
This commit modifies the branching mechanics in the release guidelines in order to simplify the process of maintaining and contributing to MDS. The most notable changes are: * `dev` is now the target for almost all PRs, whether the changes they contain are breaking or non-breaking. Maintainers are responsible for backporting non-breaking changes from `dev` to the latest release branch after merging the PR. * Instead of merging changes into `master` and rebasing `dev`, `master` is reset to point to the latest release as part of the release process. Rebasing and merging between branches (other than PRs) are no longer part of the process at all. These changes are intended to be relatively lightweight and aimed at smoothing out pain points with the current workflow; at some point we might want to consider [more significant changes] like organizing the overall directory structure by version. [more significant changes]: openmobilityfoundation#288 (comment)
thekaveman
approved these changes
Apr 17, 2019
There was a problem hiding this comment.
This is great, thank you @rf-
I'll leave this note here, but also bring it up again in the weekly call this week: I think we can (need to) adopt the new release process for 0.3.1, since all of the work that was targeted for this release has been merged into dev rather than 0.3.x. I doesn't look like it will be a problem though, I don't see any breaking changes in dev now.
|
Given the state of |
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.
This commit modifies the branching mechanics in the release guidelines in
order to simplify the process of maintaining and contributing to MDS.
The most notable changes are:
devis now the target for almost all PRs, whether the changes theycontain are breaking or non-breaking. Maintainers are responsible for
backporting non-breaking changes from
devto the latest releasebranch after merging the PR.
Instead of merging changes into
masterand rebasingdev,masteris reset to point to the latest release as part of the release process.
Rebasing and merging between branches (other than PRs) are no longer
part of the process at all.
These changes are intended to be relatively lightweight and aimed at
smoothing out pain points with the current workflow; at some point we
might want to consider more significant changes like organizing the
overall directory structure by version.
These changes would take effect for the next release after 0.3.1; we'll
want to release 0.3.1 with the existing process, rebase
devone last time,and then follow this process going forward.
Is this a breaking change
[ ] Yes, breaking
[X] No, not breaking
[ ] I'm not sure
ProvideroragencyWhich API(s) will this pull request impact:
[ ]
provider[ ]
agency[X] both