Skip to content

SDK regeneration - #120

Merged
bpapillon merged 4 commits into
mainfrom
fern-bot/2026-09-16_23-38-24_326
Sep 16, 2026
Merged

bpapillon merged 4 commits into
mainfrom
fern-bot/2026-09-16_23-38-24_326

Conversation

@fern-api

@fern-api fern-api Bot commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


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
poetry.lock add credit leases, reservations, and preflight options (#116) 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-16_23-38-24_326 origin/fern-bot/2026-09-16_23-38-24_326
    Or if you don't have the repo cloned:
    git clone https://github.com/schematichq/schematic-python.git && cd schematic-python && git checkout -b fern-bot/2026-09-16_23-38-24_326 origin/fern-bot/2026-09-16_23-38-24_326
  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 16, 2026 23:38
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-python-sdk: 5.30.2
Patches with unresolved conflicts (1):
  - patch-f12c60b5: add credit leases, reservations, and preflight options (#116)
    Run `fern-replay resolve` to apply these customizations.
@fern-api
fern-api Bot requested a review from a team as a code owner September 16, 2026 23:38
@bpapillon bpapillon self-assigned this Sep 16, 2026
@bpapillon
bpapillon merged commit 1a0792f into main Sep 16, 2026
6 checks passed
@bpapillon
bpapillon deleted the fern-bot/2026-09-16_23-38-24_326 branch September 16, 2026 23:42
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