SDK regeneration - #127
Open
fern-api[bot] wants to merge 2 commits into
Open
SDK regeneration#127fern-api[bot] wants to merge 2 commits into
fern-api[bot] wants to merge 2 commits into
Conversation
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
conformance/README.mdconformance/SPEC.mdconformance/vectors/lease-lifecycle.jsonpoetry.locksrc/schematic/leases/__init__.pysrc/schematic/leases/check.pysrc/schematic/leases/lease_manager.pysrc/schematic/leases/lease_store.pysrc/schematic/leases/redis_lease_store.pysrc/schematic/leases/redis_reservation_store.pysrc/schematic/leases/track.pysrc/schematic/leases/types.pytests/conformance/test_vectors.pytests/leases/test_check_and_track.pytests/leases/test_crash_windows.pytests/leases/test_lease_manager.pytests/leases/test_lease_store.pytests/leases/test_redis_lease_store.pytests/leases/test_redis_reservation_store.pytests/leases/test_wire_client.pyHow to resolve
git fetch origin && git checkout -b fern-bot/2026-09-21_10-03-05_553 origin/fern-bot/2026-09-21_10-03-05_553fern replay resolvefern replay resolveagain to finalizeYour 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.