Electron Releases

Back to PR Lookup
GitHubView on GitHub
MarshallOfSound

#50235: build: add patch conflict resolution workflow with CI artifacts

Merged
MarshallOfSound
Created: Mar 12, 2026, 6:50:21 PM
Merged: Mar 12, 2026, 8:46:30 PM
5 comments
Target: main

Description of Change

This PR adds documentation and CI automation to streamline the patch conflict resolution workflow when fixing conflicts on branches with open PRs.

Changes:

  1. CLAUDE.md: Added a new section documenting how to use CI-generated patch artifacts to resolve conflicts faster than running a full local sync. Includes commands for finding and downloading the artifact from a failed Apply Patches run, and guidance on fallback procedures.

  2. .github/workflows/apply-patches.yml: Added a new workflow step that uploads a update-patches.patch artifact when the Apply Patches job fails. This artifact contains the resolved patch diff from CI's 3-way merge, allowing developers to quickly apply the fix without running e sync --3 locally.

The workflow improvement reduces friction in the patch management process by leveraging CI's already-computed merge resolution.

Checklist

  • PR description included
  • Documentation updated (CLAUDE.md and workflow comments)
  • npm test passes (N/A - documentation and workflow configuration only)
  • tests are changed or added (N/A - no code logic changes)
  • relevant API documentation updated (N/A)

Release Notes

Notes: none

Backports

38-x-y
Pending
Waiting for a manual backport
39-x-y
Pending
Waiting for a manual backport
40-x-y
Pending
Waiting for a manual backport
41-x-y
Merged
PR Number
#50239
Merged At
Mar 13, 2026, 4:10:48 AM
Released In
Not yet
Release Date
Not yet

Semver Impact

Major
Breaking changes
Minor
New features
Patch
Bug fixes
None
Docs, tests, etc.

Semantic Versioning helps users understand the impact of updates:

  • Major (X.y.z): Breaking changes that may require code modifications
  • Minor (x.Y.z): New features that maintain backward compatibility
  • Patch (x.y.Z): Bug fixes that don't change the API
  • None: Changes that don't affect using facing parts of Electron