Skip to content

docs: add backporting guide and automation#2863

Merged
Saadnajmi merged 1 commit intomicrosoft:mainfrom
Saadnajmi:docs-backporting-automation
Mar 26, 2026
Merged

docs: add backporting guide and automation#2863
Saadnajmi merged 1 commit intomicrosoft:mainfrom
Saadnajmi:docs-backporting-automation

Conversation

@Saadnajmi
Copy link
Copy Markdown
Collaborator

Summary

Add backporting infrastructure for cherry-picking changes across release branches. This includes:

  • .ai/commands/backport.md — Shared AI-tool-agnostic backport instructions (works with Claude Code, Copilot, or any AI assistant)
  • .claude/commands/backport.md — Claude Code /backport slash command wrapper
  • .github/workflows/microsoft-backport.yml — GitHub Actions workflow triggered by /backport <branch> comments on PRs, with auto-update support when source PR changes
  • docsite/docs/contributing/backporting.md — Documentation page covering all backport methods

Features

  • Multi-branch support: /backport 0.81-stable 0.82-stable
  • Works on both open and merged PRs
  • Auto-updates backport PRs when source PR gets new commits
  • GitHub App authentication via actions/create-github-app-token@v2
  • Handles conflicts gracefully with manual instructions

Test plan

  • Verify docsite builds: cd docsite && yarn start — check "Backporting" page under Contributing
  • Test /backport slash command locally in Claude Code
  • Merge a test PR, comment /backport 0.81-stable, verify workflow creates backport PR

🤖 Generated with Claude Code

Add backporting infrastructure for cherry-picking changes across release
branches:

- .ai/commands/backport.md: shared AI-tool-agnostic backport instructions
- .claude/commands/backport.md: Claude Code slash command wrapper
- .github/workflows/microsoft-backport.yml: GH Actions workflow for
  /backport comments with auto-update support
- docsite/docs/contributing/backporting.md: documentation page

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@Saadnajmi Saadnajmi requested a review from a team as a code owner March 20, 2026 21:12
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Mar 20, 2026

⚠️ No Changeset found

Latest commit: 0c5b4c4

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@Saadnajmi Saadnajmi merged commit 1db0687 into microsoft:main Mar 26, 2026
15 checks passed
@Saadnajmi Saadnajmi deleted the docs-backporting-automation branch March 26, 2026 19:25
Saadnajmi added a commit to Saadnajmi/react-native-macos that referenced this pull request Mar 27, 2026
## Summary
Add backporting infrastructure for cherry-picking changes across release
branches. This includes:

- **`.ai/commands/backport.md`** — Shared AI-tool-agnostic backport
instructions (works with Claude Code, Copilot, or any AI assistant)
- **`.claude/commands/backport.md`** — Claude Code `/backport` slash
command wrapper
- **`.github/workflows/microsoft-backport.yml`** — GitHub Actions
workflow triggered by `/backport <branch>` comments on PRs, with
auto-update support when source PR changes
- **`docsite/docs/contributing/backporting.md`** — Documentation page
covering all backport methods

### Features
- Multi-branch support: `/backport 0.81-stable 0.82-stable`
- Works on both open and merged PRs
- Auto-updates backport PRs when source PR gets new commits
- GitHub App authentication via `actions/create-github-app-token@v2`
- Handles conflicts gracefully with manual instructions

## Test plan
- [ ] Verify docsite builds: `cd docsite && yarn start` — check
"Backporting" page under Contributing
- [ ] Test `/backport` slash command locally in Claude Code
- [ ] Merge a test PR, comment `/backport 0.81-stable`, verify workflow
creates backport PR

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Saadnajmi added a commit that referenced this pull request Mar 28, 2026
…selection, CVEs) (#2876)

## Summary

Backport of 10 commits from `main` to `0.81-stable`:

- **fix(spm):** fix pre-existing macOS porting bugs (#2869)
- **fix(transforms):** enable transforms on new arch and fix hit testing
on both arches (#2866)
- **chore(deps-dev):** bump undici from 5.29.0 to 6.24.0 (#2871)
- **fix(fabric):** colors not respecting dark mode appearance, implement
platform color (#2867)
- **fix:** adjust content inset behavior for macOS (#2806)
- **fix:** reduce dependency CVE overrides and refresh vulnerable
transitive deps (#2874)
- **feat(fabric, text):** support native text selection when
selectable={true} (#2864)
- **fix:** macOS ScrollView resize and content inset behavior (#2732)
- **docs:** add backporting guide and automation (#2863)
- **fix(fabric, textinput):** support `enableFocusRing`

### Conflict resolutions

- `RCTUIView.h/m` → On 0.81-stable, `RCTUIView` lives in
`React/Base/RCTUIKit.h` and `React/Base/macOS/RCTUIKit.m` (the RCTUIKit
module refactor hasn't landed on 0.81). Transform changes were manually
applied to these files.
- `RCTUIKitCompat.h/m` → `NSColor (RCTAppearanceResolving)` category was
added to `RCTUIKit.h/m` instead.
- Lockfile conflicts resolved by accepting incoming CVE fixes.

## Test Plan

- Same as the original PRs
- Verify transforms render correctly on macOS (old + new arch)
- Verify dark mode color resolution works in Fabric
- Verify ScrollView resize and content inset behavior
- Verify text selection with selectable={true}
- Verify enableFocusRing on TextInput in Fabric

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: eadron <eadron@users.noreply.github.com>
Co-authored-by: Kyle Essenmacher <15271436+kessenma@users.noreply.github.com>
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.

2 participants