Skip to content

SDK regeneration - #2

Open
fern-api[bot] wants to merge 2 commits into
fern-bot/2026-07-21_04-00-18_403from
fern-bot/2026-07-21_05-20-17_795
Open

SDK regeneration#2
fern-api[bot] wants to merge 2 commits into
fern-bot/2026-07-21_04-00-18_403from
fern-bot/2026-07-21_05-20-17_795

Conversation

@fern-api

@fern-api fern-api Bot commented Jul 21, 2026

Copy link
Copy Markdown

Automated SDK generation by Fern


✅ Customizations automatically preserved, but 1 file needs your attention.

Action required: 1 file 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 Release v6.0.0 (auth0#1371) 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-07-21_05-20-17_795 origin/fern-bot/2026-07-21_05-20-17_795
    Or if you don't have the repo cloned:
    git clone https://github.com/fern-demo/internal-node-auth0.git && cd internal-node-auth0 && git checkout -b fern-bot/2026-07-21_05-20-17_795 origin/fern-bot/2026-07-21_05-20-17_795
  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 July 21, 2026 05:20
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-typescript-sdk: 3.82.2
Patches applied (2):
  - patch-066ff9e0: docs: add v6 migration guide for breaking changes in v6.0.0 (auth0#1368)
  - patch-d8faf7a2: docs: update v6 migration guide with federatedConnectionsTokensets and federated_connections_access_tokens breaking changes (auth0#1370)

Patches with unresolved conflicts (1):
  - patch-a823058b: Release v6.0.0 (auth0#1371)
    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