NOTICE: Stainless generated code has conflicted with your custom code#20
Merged
juliuslipp merged 2 commits intonext--merge-conflictfrom Jan 5, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
We have detected a conflict between code generated by Stainless' generated code and code that you have merged to main. Please resolve the conflict and merge so that Stainless can continue to update your repository.
You can resolve in the GitHub UI if allowed. Otherwise, clone the repository and run:
git checkout next--merge-conflictgit reset --hard origin/next--merge-conflictgit merge origin/generated--merge-conflictResolve the conflict in your editor and then run:
git merge --continuegit push -u origin next--merge-conflictFinally, merge the PR through the GitHub UI if it has not been automatically merged.