Merge two config into recommended config
#155
Merged
+38
−62
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
bmish
force-pushed
the
recommended-merge-two-config
branch
from
050e156 to
8d00e31
Compare
bmish
force-pushed
the
recommended-merge-two-config
branch
from
8d00e31 to
42715d2
Compare
platinumazure
approved these changes
Mar 9, 2021
bmish
force-pushed
the
recommended-merge-two-config
branch
from
42715d2 to
ed2cc60
Compare
platinumazure
approved these changes
Mar 15, 2021
|
I'll rebase this in one minute... |
|
Hi @bmish, looks like there are now conflicts, mind rebasing on or merging master? Thanks! |
bmish
force-pushed
the
recommended-merge-two-config
branch
from
ed2cc60 to
80dd185
Compare
|
Can you merge #157 first? Then I'll need to rebase this PR again after that. |
platinumazure
approved these changes
Mar 15, 2021
This was referenced Mar 15, 2021
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 can be merged as part of the V6 release: #114.
It would be easiest if we merged some other changes first then rebased this PR:
recommendedrules for v6 Add morerecommendedrules for v6 #157require-expectrule to default toexpect-simpleoption Updaterequire-expectrule to default toexpect-simpleoption #158