Skip to content

SDK regeneration - #139

Open
fern-api[bot] wants to merge 2 commits into
mainfrom
fern-bot/2026-09-03_07-01-29_508
Open

SDK regeneration#139
fern-api[bot] wants to merge 2 commits into
mainfrom
fern-bot/2026-09-03_07-01-29_508

Conversation

@fern-api

@fern-api fern-api Bot commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


✅ Customizations automatically preserved, but 6 files need your attention.

Action required: 6 files with unresolved customization conflicts

The new generation changed code you previously customized. Non-conflicting customizations have been applied automatically. The following files need manual resolution:

File Your customization Why it conflicted
Cargo.lock fix(deps): patch two advisories; keep the verification script The new generation changed the same lines you edited
Cargo.lock Alpha build The new generation changed the same lines you edited
Cargo.toml Alpha build The new generation changed the same lines you edited
dist-workspace.toml Customer customizations (composite) This customization was from a previous generation
Cargo.lock feat: tag CLI requests with the command that made them (#132) This customization was from a previous generation
Cargo.toml feat: tag CLI requests with the command that made them (#132) The new generation changed the same lines you edited

How to resolve

  1. Check out this branch:
    git fetch origin && git checkout -b fern-bot/2026-09-03_07-01-29_508 origin/fern-bot/2026-09-03_07-01-29_508
    Or if you don't have the repo cloned:
    git clone https://github.com/elevenlabs/cli.git && cd cli && git checkout -b fern-bot/2026-09-03_07-01-29_508 origin/fern-bot/2026-09-03_07-01-29_508
  2. Run: fern replay resolve
  3. Open the conflicting files in your editor — you'll see standard merge conflict markers
  4. Resolve using your editor's merge tools (VS Code, IntelliJ, etc.)
  5. Run: fern replay resolve again to finalize
  6. Push your changes

Your resolved customizations will be remembered on future SDK generations.
If you merge this PR without resolving, your unresolved customizations will conflict again on the next generation.

fern-api Bot added 2 commits September 3, 2026 07:01
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-cli-generator: 0.38.4
Patches applied (1):
  - patch-3324bcc8: build: publish prereleases to homebrew and scoop

Patches with unresolved conflicts (4):
  - patch-809b383f: fix(deps): patch two advisories; keep the verification script
  - patch-590ac6e0: Alpha build
  - patch-composite-7dd8e976: Customer customizations (composite)
  - patch-147b7f4d: feat: tag CLI requests with the command that made them (#132)
    Run `fern-replay resolve` to apply these customizations.
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