Fixup choropleth select test #2109
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
|
Looks great 💃 -thanks for the quick resolution! Retro: We have a general policy of not rebasing PR branches - I learnt the lesson that this guidance doesn't prohibit us from branching locally and rebasing to see if there's some odd conflict 😄 |
|
@etpinard What was your secret to fixing it so quickly? I rarely if ever encountered this type of merge sequencing issue where two branches passed tests and merged fine but khmmm.... the person doing the 2nd merge, me, should've rebased in a test branch. |
Just merge master into your branch if that happens again
yes, that adds an extra commit, but it's the least-bad way of doing things that I know 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.
Tests are currently failing on master because PR #2099 got merged on a branch behind #2081
In detail, the PR #2099 branch didn't have #2081's
addInvisibleutility which messed up the trace indices and lead to a failing test.@monfera please review.