[PR #5583] [MERGED] ci: add cherry-picking to the main branch #23001

Closed
opened 2026-04-15 21:24:53 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/better-auth/better-auth/pull/5583
Author: @himself65
Created: 10/26/2025
Status: Merged
Merged: 10/26/2025
Merged by: @himself65

Base: canaryHead: himself65/2025/10/25/cherry-pick


📝 Commits (1)

  • 659d5a2 ci: add cherry-picking to the main branch

📊 Changes

1 file changed (+93 additions, -0 deletions)

View changed files

.github/workflows/cherry-pick-to-main.yml (+93 -0)

📄 Description

Summary by cubic

Automates cherry-picking of merged canary PRs to main when labeled "merge-to-main", with clear success and conflict comments. This reduces manual work and keeps main aligned with selected changes.

  • New Features

    • Triggers on closed, merged PRs to canary with label "merge-to-main".
    • Cherry-picks the merge commit to main and pushes on success.
    • On conflict, aborts and comments with the conflicting files for manual follow-up.
  • Migration

    • Label eligible canary PRs with "merge-to-main" to enable auto cherry-pick.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/better-auth/better-auth/pull/5583 **Author:** [@himself65](https://github.com/himself65) **Created:** 10/26/2025 **Status:** ✅ Merged **Merged:** 10/26/2025 **Merged by:** [@himself65](https://github.com/himself65) **Base:** `canary` ← **Head:** `himself65/2025/10/25/cherry-pick` --- ### 📝 Commits (1) - [`659d5a2`](https://github.com/better-auth/better-auth/commit/659d5a26f3b7a659d3b626cfcb0cbcabaa779ad3) ci: add cherry-picking to the main branch ### 📊 Changes **1 file changed** (+93 additions, -0 deletions) <details> <summary>View changed files</summary> ➕ `.github/workflows/cherry-pick-to-main.yml` (+93 -0) </details> ### 📄 Description <!-- This is an auto-generated description by cubic. --> ## Summary by cubic Automates cherry-picking of merged canary PRs to main when labeled "merge-to-main", with clear success and conflict comments. This reduces manual work and keeps main aligned with selected changes. - **New Features** - Triggers on closed, merged PRs to canary with label "merge-to-main". - Cherry-picks the merge commit to main and pushes on success. - On conflict, aborts and comments with the conflicting files for manual follow-up. - **Migration** - Label eligible canary PRs with "merge-to-main" to enable auto cherry-pick. <!-- End of auto-generated description by cubic. --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-15 21:24:53 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/better-auth#23001