Drop merge up and release branch creation steps #4686
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
They are causing more issues than they are solving for this repository, where manual merges up are frequent, as well as git conflicts, and where the branch setup is a bit more complex than other repositories (more branches maintained at a time, more frequent major releases).
morozov
approved these changes
Jun 22, 2021
SenseException
approved these changes
Jun 22, 2021
|
Thanks, @greg0ire! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
They are causing more issues than they are solving for this repository,
where manual merges up are frequent, as well as git conflicts, and where
the branch setup is a bit more complex than other repositories (more
branches maintained at a time, more frequent major releases).