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 nextgit merge origin/generated
Resolve the conflict in your editor and then run:
git merge --continuegit push -u origin next
Finally, merge the PR through the GitHub UI if it has not been automatically merged.
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
git merge origin/generated
Resolve the conflict in your editor and then run:
git merge --continue
git push -u origin next
Finally, merge the PR through the GitHub UI if it has not been automatically merged.