Merged
Conversation
Member
|
so be it ! :) |
4001300 to
11911c0
Compare
Member
Author
|
Okay this should be working. For anyone curious:
All devs should do Once this is green, I will temporarily reenable merge-commiting for this repo, merge this PR that way (so that the |
Member
|
I was expecting/assuming a rebase merge would be needed for this so that's fine with me |
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
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.
Closes #10641
I think it's time :) Happy to help with fixing any open PRs that need a rebase/merge fix. First step is to add to CIs and see that they fail :) Then I'll push a commit to fix all the files in the repo. Then I think we can merge, then add that commit to a new git blame skip file