Add merge upstream #22
Merged
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
…chscience#43) Co-authored-by: Steven McVicker <[email protected]> Co-authored-by: Gareth Lewin <[email protected]> Co-authored-by: Sean Lydon <[email protected]>
adatzer
approved these changes
Nov 14, 2024
|
Note: Typically we rebase and merge, but this branch cannot be rebased, because of a conflict. The conflict is between the new commit from upstream and the commits we have made in our fork before that. For good hygiene, it is preferable to avoid any action that alters this commit, which would happen if we either squash and merge, or rebase this branch manually. So I'm opting to create a merge commit - we usually avoid them for aesthetic reasons, in this case it's the appropriate thing to do. |
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 PR pulls in a commit from the upstream repo and meges it into develop