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

chore: merge generated code into main #255

Merged
merged 1 commit into from
Mar 15, 2022
Merged

chore: merge generated code into main #255

merged 1 commit into from
Mar 15, 2022

Conversation

millotp
Copy link
Collaborator

@millotp millotp commented Mar 15, 2022

Co-authored-by: Clément Vannicatte 20689156+shortcuts@users.noreply.github.com

Doing it manually for now.

Co-authored-by: Clément Vannicatte <20689156+shortcuts@users.noreply.github.com>
@netlify
Copy link

netlify bot commented Mar 15, 2022

✔️ Deploy Preview for api-clients-automation canceled.

🔨 Explore the source changes: 1d1d51a

🔍 Inspect the deploy log: https://app.netlify.com/sites/api-clients-automation/deploys/623068b3e030c5000972e3dd

@millotp millotp enabled auto-merge (squash) March 15, 2022 10:21
@shortcuts
Copy link
Member

Context on why we need to merge it:

As we still have the clients on main, we need to merge generated/main to main otherwise the generation commit will contain all of the previous changes including the new ones: see #251 (comment).

@millotp millotp merged commit 8bc743e into main Mar 15, 2022
@millotp millotp deleted the generated/main branch March 15, 2022 10:27
shortcuts added a commit that referenced this pull request Apr 22, 2022
Co-authored-by: Clément Vannicatte <20689156+shortcuts@users.noreply.github.com>

Co-authored-by: api-clients-bot <bot@algolia.com>
Co-authored-by: Clément Vannicatte <20689156+shortcuts@users.noreply.github.com>
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.

2 participants