Skip to content

SDK regeneration#27

Merged
cbrady merged 2 commits into
mainfrom
fern-bot/2026-06-08_11-35-15_341
Jun 8, 2026
Merged

SDK regeneration#27
cbrady merged 2 commits into
mainfrom
fern-bot/2026-06-08_11-35-15_341

Conversation

@fern-api

@fern-api fern-api Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


✅ Customizations automatically preserved, but 1 file needs your attention.

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
lib/schematic/datastream/merge.rb handle partial messages properly 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-06-08_11-35-15_341 origin/fern-bot/2026-06-08_11-35-15_341
    Or if you don't have the repo cloned:
    git clone https://github.com/schematichq/schematic-ruby.git && cd schematic-ruby && git checkout -b fern-bot/2026-06-08_11-35-15_341 origin/fern-bot/2026-06-08_11-35-15_341
  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 June 8, 2026 18:13
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-ruby-sdk: 1.1.13
Patches with unresolved conflicts (2):
  - patch-6a2db2b5: handle partial messages properly
  - patch-46462128: add tests and address nits
    Run `fern-replay resolve` to apply these customizations.
@fern-api fern-api Bot force-pushed the fern-bot/2026-06-08_11-35-15_341 branch from e7a99ad to 180a417 Compare June 8, 2026 18:13
@cbrady cbrady merged commit f49719b into main Jun 8, 2026
3 checks passed
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