Skip to content

SDK regeneration#352

Open
fern-api[bot] wants to merge 3 commits into
mainfrom
fern-bot/2026-06-06_00-48-32_080
Open

SDK regeneration#352
fern-api[bot] wants to merge 3 commits into
mainfrom
fern-bot/2026-06-06_00-48-32_080

Conversation

@fern-api

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

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


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

Action required: 8 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 Minor cleanups The new generation changed the same lines you edited
src/BaseClient.ts Minor cleanups The new generation changed the same lines you edited
src/version.ts Minor cleanups The new generation changed the same lines you edited
package.json Revert changes related to Fern replays The new generation changed the same lines you edited
src/BaseClient.ts Revert changes related to Fern replays The new generation changed the same lines you edited
src/version.ts Revert changes related to Fern replays The new generation changed the same lines you edited
package.json Bump version The new generation changed the same lines you edited
src/version.ts Bump version 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-06_00-48-32_080 origin/fern-bot/2026-06-06_00-48-32_080
    Or if you don't have the repo cloned:
    git clone https://github.com/PipedreamHQ/pipedream-sdk-typescript.git && cd pipedream-sdk-typescript && git checkout -b fern-bot/2026-06-06_00-48-32_080 origin/fern-bot/2026-06-06_00-48-32_080
  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 fern-api Bot force-pushed the fern-bot/2026-06-06_00-48-32_080 branch 13 times, most recently from d1c7d1c to 2cfba9f Compare June 17, 2026 16:58
fern-api Bot added 2 commits June 17, 2026 17:11
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-typescript-node-sdk: 3.69.1
Patches with unresolved conflicts (4):
  - patch-9908f781: Minor cleanups
  - patch-e29389db: Revert changes related to Fern replays
  - patch-2fa7f6ee: Proxy auth fix
  - patch-a14651d4: Bump version
    Run `fern-replay resolve` to apply these customizations.
@fern-api fern-api Bot force-pushed the fern-bot/2026-06-06_00-48-32_080 branch from 2cfba9f to ae7209c Compare June 17, 2026 17:11
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