Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NOTICE: Stainless generated code has conflicted with your custom code #138

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

stainless-app[bot]
Copy link
Contributor

@stainless-app stainless-app bot commented Jan 9, 2025

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-conflict
git reset --hard origin/next--merge-conflict
git merge origin/generated--merge-conflict

Resolve the conflict in your editor and then run:
git merge --continue
git push -u origin next--merge-conflict

Finally, merge the PR through the GitHub UI if it has not been automatically merged.

@stainless-app stainless-app bot merged commit f756a20 into next--merge-conflict Jan 9, 2025
@stainless-app stainless-app bot deleted the generated--merge-conflict branch January 9, 2025 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0 participants