Fixes for recent merge-with-fails #576
Merged
Conversation
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #576 +/- ##
=======================================
Coverage 89.60% 89.60%
=======================================
Files 8 8
Lines 2473 2473
Branches 420 420
=======================================
Hits 2216 2216
Misses 159 159
Partials 98 98 ☔ View full report in Codecov by Sentry. |
Member
Author
|
Note: now enabled auto-fix on PRs That won't actually stop me merging without due care + attention, like #567. For reference, autofixing is effectively on in Iris, since it is the default according to the config docs |
trexfeathers
approved these changes
Nov 29, 2024
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.
Looks like I made a mistake merging #567
But it also seems that the required automatic fixes which a pre-commit run produces are not included in the pre-commit update PR. Not sure if that is intended + should work, or what.