Skip to content

SDK regeneration - #50

Merged
duharry0915 merged 2 commits into
mainfrom
fern-bot/2026-09-02_22-51-57_502
Sep 2, 2026
Merged

SDK regeneration#50
duharry0915 merged 2 commits into
mainfrom
fern-bot/2026-09-02_22-51-57_502

Conversation

@fern-api

@fern-api fern-api Bot commented Sep 2, 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-02_22-51-57_502 origin/fern-bot/2026-09-02_22-51-57_502
    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-02_22-51-57_502 origin/fern-bot/2026-09-02_22-51-57_502
  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 2, 2026 22:51
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.
@duharry0915
duharry0915 merged commit cbd1d7f into main Sep 2, 2026
11 checks passed
@duharry0915
duharry0915 deleted the fern-bot/2026-09-02_22-51-57_502 branch September 2, 2026 22:54
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