BUGFIX: Reset accidentally upmerged branch version constraints#3412
Merged
mficzel merged 2 commits intoneos:masterfrom Aug 17, 2021
Merged
Conversation
Some constraints of the 7.1 branch have been accidentally upmerged to master. This change reset those to dev-master.
kdambekalns
approved these changes
Aug 16, 2021
Member
kdambekalns
left a comment
kdambekalns
left a comment
There was a problem hiding this comment.
Oh, that was caused by 42771e2#diff-d2ab9925cad7eac58e0ff4cc0d251a937ecf49e4b6bf57f8b95aab76648a9d34 and has been there for quite some time… 🙈
Member
Author
|
Jenkins did that correctly for 7.1 ... only problem is that is was later merged back to master. Maybe we can prevent that by immediately merging new branches back to master in future (without the adjusted version requirements). |
albe
approved these changes
Aug 17, 2021
Contributor
Yes - had the same idea in slack not so long ago. Should work seemless to do this inside the create-branch scripts |
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
3 participants
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.
Some constraints of the 7.1 branch seem to have been accidentally upmerged to master.
This change reset those to dev-master again.