mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
a7e6649ffb
* build: add patch conflict resolution workflow with CI artifacts (#50235) ci: upload patch conflict fix as artifact in apply-patches When patch-up.js cannot auto-push the 3-way-merged patch diff (e.g. on fork PRs), the checkout action already writes patches/update-patches.patch and tells the user to check CI artifacts — but nothing was uploading it. This adds the missing upload-artifact step to the apply-patches job so the resolved diff is available for download, and documents in CLAUDE.md that pulling this artifact and applying it with `git am` is the fast path for fixing patch conflicts on PR branches without a full local sync. Co-authored-by: Claude <noreply@anthropic.com> (cherry picked from commit816e5964fb) * build: skip archiving patch conflict fix artifact (#50251) The update-patches artifact is a single .patch file, so zipping it is unnecessary overhead. With archive: false, gh run download fetches the raw file directly without requiring a decompression step. Co-authored-by: Claude <noreply@anthropic.com> (cherry picked from commitf4a50a8fde) --------- Co-authored-by: Claude <noreply@anthropic.com>