set merge strategy for verify_types.json in .gitattributes#2713
Merged
jakkdl merged 1 commit intopython-trio:masterfrom Jul 21, 2023
Merged
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #2713 +/- ##
=======================================
Coverage 98.88% 98.88%
=======================================
Files 113 113
Lines 16483 16483
Branches 3000 3000
=======================================
Hits 16300 16300
Misses 126 126
Partials 57 57 |
TeamSpen210
approved these changes
Jul 21, 2023
Contributor
TeamSpen210
left a comment
TeamSpen210
left a comment
There was a problem hiding this comment.
Forcing a conflict makes sense, just regenerate it in that situation.
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
2 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.
Quickly merging this small one to ease merging my typechecking branches into eachother.