Skip to content

SDK regeneration - #317

Merged
jverce merged 2 commits into
mainfrom
fern-bot/2026-08-27_19-58-24_490
Sep 2, 2026
Merged

SDK regeneration#317
jverce merged 2 commits into
mainfrom
fern-bot/2026-08-27_19-58-24_490

Conversation

@fern-api

@fern-api fern-api Bot commented Aug 27, 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-08-27_19-58-24_490 origin/fern-bot/2026-08-27_19-58-24_490
    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-08-27_19-58-24_490 origin/fern-bot/2026-08-27_19-58-24_490
  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-08-27_19-58-24_490 branch from 379cbf1 to 245e9f4 Compare August 28, 2026 23:11
fern-api Bot added 2 commits August 31, 2026 20:29
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-08-27_19-58-24_490 branch from 245e9f4 to 963b57d Compare August 31, 2026 20:29
@jverce
jverce merged commit b3a4e13 into main Sep 2, 2026
3 checks passed
@jverce
jverce deleted the fern-bot/2026-08-27_19-58-24_490 branch September 2, 2026 15:10
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