Skip to content

Conversation

@bene2k1
Copy link
Member

@bene2k1 bene2k1 commented Mar 18, 2025

Your checklist for this pull request

Description

Please describe what you added or changed.

@ldecarvalho-doc ldecarvalho-doc changed the title Fix genapi zed fix(genapi): zed Mar 18, 2025
@RoRoJ RoRoJ added the do not merge PR that shouldn't be merged before a specific date (eg release) label Mar 20, 2025
@RoRoJ
Copy link
Contributor

RoRoJ commented Mar 20, 2025

I did a rebase to fix a conlifct with this file: pages/generative-apis/reference-content/integrating-generative-apis-with-popular-tools.mdx

However, I am not confident that I correctly resolved the conflict, and I'm not sure which modifications are required in comparison to the version on main

This is how the diff for that file looked before the rebase.

Wait for Franck or Bene to confirm required modifications for this file.

image

@bene2k1 bene2k1 removed the do not merge PR that shouldn't be merged before a specific date (eg release) label Mar 24, 2025
@bene2k1 bene2k1 merged commit 23db3c7 into main Mar 24, 2025
3 checks passed
@bene2k1 bene2k1 deleted the fix-genapi-zed branch March 24, 2025 09:05
RoRoJ added a commit that referenced this pull request Mar 26, 2025
* Update integrating-generative-apis-with-popular-tools.mdx

Add quickstart for Zed AI configuration with Generative APIs.

* feat(genapi): add zed ai

* Apply suggestions from code review

Co-authored-by: Rowena Jones <36301604+RoRoJ@users.noreply.github.com>

* fix(genapi): fix dates

* Apply suggestions from code review

* fix(conflicts): fix zed file conflicts

---------

Co-authored-by: fpagny <franckpagny@hotmail.fr>
Co-authored-by: Rowena Jones <36301604+RoRoJ@users.noreply.github.com>
Co-authored-by: Rowena <rjones@scaleway.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.

5 participants