Skip to content

SDK Generation - #35

Merged
Kizy625 merged 2 commits into
mainfrom
fern-bot/2026-06-24_15-56-36_408
Jun 24, 2026
Merged

Kizy625 merged 2 commits into
mainfrom
fern-bot/2026-06-24_15-56-36_408

Conversation

@fern-api

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

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


Action required: 4 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
README.md Customer customizations (composite) The new generation changed the same lines you edited
poetry.lock Customer customizations (composite) The new generation changed the same lines you edited
pyproject.toml Customer customizations (composite) The new generation changed the same lines you edited
src/newscatcher_catchall/core/client_wrapper.py Customer customizations (composite) 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-24_15-56-36_408 origin/fern-bot/2026-06-24_15-56-36_408
    Or if you don't have the repo cloned:
    git clone https://github.com/Newscatcher/newscatcher-catchall-python.git && cd newscatcher-catchall-python && git checkout -b fern-bot/2026-06-24_15-56-36_408 origin/fern-bot/2026-06-24_15-56-36_408
  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 24, 2026 15:56
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-python-sdk: 5.14.21
Patches with unresolved conflicts (1):
  - patch-composite-ee7b989e: Customer customizations (composite)
    Run `fern-replay resolve` to apply these customizations.
@Kizy625
Kizy625 merged commit 2fd907e into main Jun 24, 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