Skip to content

SDK regeneration#34

Merged
AdamGold merged 3 commits into
mainfrom
fern-bot/2026-06-17_11-23-58_072
Jun 17, 2026
Merged

SDK regeneration#34
AdamGold merged 3 commits into
mainfrom
fern-bot/2026-06-17_11-23-58_072

Conversation

@fern-api

@fern-api fern-api Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


Action required: 3 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
package.json feat: rename exchanged token option (#30) The new generation changed the same lines you edited
src/BaseClient.ts feat: rename exchanged token option (#30) The new generation changed the same lines you edited
src/version.ts feat: rename exchanged token option (#30) 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-06-17_11-23-58_072 origin/fern-bot/2026-06-17_11-23-58_072
    Or if you don't have the repo cloned:
    git clone https://github.com/islo-labs/typescript-sdk.git && cd typescript-sdk && git checkout -b fern-bot/2026-06-17_11-23-58_072 origin/fern-bot/2026-06-17_11-23-58_072
  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 and others added 3 commits June 17, 2026 11:23
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-typescript-node-sdk: 3.65.5
Patches with unresolved conflicts (1):
  - patch-bac1dbe6: feat: rename exchanged token option (#30)
    Run `fern-replay resolve` to apply these customizations.
@AdamGold AdamGold merged commit 17edec5 into main Jun 17, 2026
6 checks passed
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.

1 participant