Skip to content

SDK regeneration - #130

Merged
cbrady merged 3 commits into
mainfrom
fern-bot/2026-09-28_10-04-29_335
Sep 28, 2026
Merged

cbrady merged 3 commits into
mainfrom
fern-bot/2026-09-28_10-04-29_335

Conversation

@fern-api

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

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


Action required: 20 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
conformance/README.md add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
conformance/SPEC.md add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
conformance/vectors/lease-lifecycle.json add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
poetry.lock add credit leases, reservations, and preflight options (#116) The new generation changed the same lines you edited
src/schematic/leases/__init__.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
src/schematic/leases/check.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
src/schematic/leases/lease_manager.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
src/schematic/leases/lease_store.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
src/schematic/leases/redis_lease_store.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
src/schematic/leases/redis_reservation_store.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
src/schematic/leases/track.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
src/schematic/leases/types.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/conformance/test_vectors.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/leases/test_check_and_track.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/leases/test_crash_windows.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/leases/test_lease_manager.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/leases/test_lease_store.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/leases/test_redis_lease_store.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/leases/test_redis_reservation_store.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file
tests/leases/test_wire_client.py add credit leases, reservations, and preflight options (#116) Both the generator and your customization created this file

How to resolve

  1. Check out this branch:
    git fetch origin && git checkout -b fern-bot/2026-09-28_10-04-29_335 origin/fern-bot/2026-09-28_10-04-29_335
    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-28_10-04-29_335 origin/fern-bot/2026-09-28_10-04-29_335
  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 10:04
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 28, 2026 10:04
@cbrady
cbrady merged commit 6eb3bae into main Sep 28, 2026
6 checks passed
@cbrady
cbrady deleted the fern-bot/2026-09-28_10-04-29_335 branch September 28, 2026 17:28
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