#49667: ci: use squash merge for apply patches workflow
Merged
Description of Change
The initial implementation here did a git rebase to rebase the PR onto the base branch before applying patches. In practice this has turned out to be a problem, as some PRs may have a commit history which cannot cleanly rebase onto the base branch, but would be fine if squashed.
This PR refactors to align with how we actually merge PRs in practice, with a squash merge. As such it has changed to check out the base branch, and then squash merge in the PR. It leaves the changes staged rather than committing them since it's just for checking purposes.
Checklist
- PR description included
Release Notes
Notes: none
Backports
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