chore: adaptations for nightly-2024-02-15#10585
Merged
kim-em merged 10 commits intobump/v4.7.0from Feb 18, 2024
Merged
Conversation
Contributor
kim-em
commented
Feb 15, 2024
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
YaelDillies
approved these changes
Feb 16, 2024
Vierkantor
reviewed
Feb 16, 2024
Vierkantor
reviewed
Feb 16, 2024
Comment on lines
+759
to
+762
| instance instIccUnique : Unique (Set.Icc a a) where | ||
| default := ⟨a, by simp⟩ | ||
| uniq y := Subtype.ext <| by simpa using y.2 | ||
|
|
Contributor
There was a problem hiding this comment.
This came from merging master into this branch. Hopefully that doesn't mess up the version history.
Contributor
Author
There was a problem hiding this comment.
I think the trick is to avoid ever merging master into a bump/nightly-YYYY-MM-DD branch. Instead, first merge master into bump/v4.X.0. Then merge bump/v4.X.0 into bump/nightly-YYYY-MM-DD.
Member
|
bors r- I see that @Vierkantor made some good points |
Contributor
|
Canceled. |
Co-authored-by: Anne Baanen <Vierkantor@users.noreply.github.com>
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
5 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.