Skip to content

SDK regeneration#315

Open
fern-api[bot] wants to merge 2 commits into
mainfrom
fern-bot/2026-06-16_20-04-36_557
Open

SDK regeneration#315
fern-api[bot] wants to merge 2 commits into
mainfrom
fern-bot/2026-06-16_20-04-36_557

Conversation

@fern-api

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

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


Action required: 2 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
pyproject.toml Normalize paths in the request URLs The new generation changed the same lines you edited
src/pipedream/core/client_wrapper.py Normalize paths in the request URLs 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-16_20-04-36_557 origin/fern-bot/2026-06-16_20-04-36_557
    Or if you don't have the repo cloned:
    git clone https://github.com/PipedreamHQ/pipedream-sdk-python.git && cd pipedream-sdk-python && git checkout -b fern-bot/2026-06-16_20-04-36_557 origin/fern-bot/2026-06-16_20-04-36_557
  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 fern-api Bot force-pushed the fern-bot/2026-06-16_20-04-36_557 branch 13 times, most recently from 81c1459 to a43dec6 Compare June 17, 2026 16:58
fern-api Bot added 2 commits June 17, 2026 17:11
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-python-sdk: 5.12.1
Patches with unresolved conflicts (1):
  - patch-995f4ec5: Normalize paths in the request URLs
    Run `fern-replay resolve` to apply these customizations.
@fern-api fern-api Bot force-pushed the fern-bot/2026-06-16_20-04-36_557 branch from a43dec6 to 4e7a910 Compare June 17, 2026 17:11
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.

0 participants