Skip to content

SDK regeneration - #56

Merged
shalim786 merged 2 commits into
mainfrom
fern-bot/2026-09-28_19-36-17_081
Sep 28, 2026
Merged

shalim786 merged 2 commits into
mainfrom
fern-bot/2026-09-28_19-36-17_081

Conversation

@fern-api

@fern-api fern-api Bot commented Sep 28, 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
Cargo.lock chore: restore .fernignore, defer windows npm package The new generation changed the same lines you edited
.github/workflows/ci.yml chore: publish packageIdentity metadata to npm, restore .fernignore This customization was from a previous generation
Cargo.lock chore: publish packageIdentity metadata to npm, restore .fernignore 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-28_19-36-17_081 origin/fern-bot/2026-09-28_19-36-17_081
    Or if you don't have the repo cloned:
    git clone https://github.com/agentmail-to/agentmail-cli.git && cd agentmail-cli && git checkout -b fern-bot/2026-09-28_19-36-17_081 origin/fern-bot/2026-09-28_19-36-17_081
  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 28, 2026 19:36
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-cli-generator: 0.38.10
Patches with unresolved conflicts (2):
  - patch-bf63549e: chore: restore .fernignore, defer windows npm package
  - patch-9c5e5935: chore: publish packageIdentity metadata to npm, restore .fernignore
    Run `fern-replay resolve` to apply these customizations.
@shalim786
shalim786 enabled auto-merge September 28, 2026 19:58
@shalim786
shalim786 merged commit df4da1f into main Sep 28, 2026
11 checks passed
@shalim786
shalim786 deleted the fern-bot/2026-09-28_19-36-17_081 branch September 28, 2026 19:58
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.

2 participants