Fix labels after bad merge #660
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
|
What's a bad merge in this context? Is it something we need to fix in our process or just like a problem resolving conflicts? |
|
Hit a flake due to #639, re-ran. |
|
@jbarrick-mesosphere I was working on the same code in two branches and when I merged after merging the first one into master I pretty much reverted 0356f0c#diff-c2e52ee1aa92f961c976702674f98591 and 32ec485#diff-c2e52ee1aa92f961c976702674f98591 so the upgrades are broken again on master :( Prevention: should finally write upgrade test :) Luckily I am working on that upgrade command and testing it so I found out before the release |
jbarrick-mesosphere
approved these changes
Jul 26, 2019
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.