使用GitHub Actions实现Git自动向后移植时cherry-pick报错求助

问题场景 #

我维护的Git仓库有main和staging两个分支，需求是当变更合并到staging分支时，自动将新变更同步到main分支。我用GitHub Actions配置了backport工作流，但触发时出现cherry-pick失败的错误，日志如下：

/usr/bin/git switch main
Already on 'main'
Your branch is up to date with 'origin/main'.
/usr/bin/git switch --create backport-16-to-main
Switched to a new branch 'backport-16-to-main'
/usr/bin/git cherry-pick -x c3434caf8741axxxxxx
error: commit c3434cafxxxxxxx is a merge but no -m option was given.
fatal: cherry-pick failed
/usr/bin/git cherry-pick --abort
error: no cherry-pick or revert in progress
fatal: cherry-pick failed
Error: Error: The process '/usr/bin/git' failed with exit code 128

当前使用的工作流配置：

name: Backport
on:
  pull_request_target:
    types:
      - closed
      - labeled

jobs:
  backport:
    name: Backport
    runs-on: ubuntu-latest
    # Only react to merged PRs for security reasons.
    if: >
      github.event.pull_request.merged
      && (
        github.event.action == 'closed'
        || (
          github.event.action == 'labeled'
          && contains(github.event.label.name, 'backport')
        )
      )
    steps:
      - uses: tibdex/backport@v2
        with:
          github_token: ${{ secrets.GIT_BACKPORT }}

错误原因 #

这个问题是因为合并到staging的是合并提交（merge commit），这类提交存在多个父节点。Git的cherry-pick命令处理合并提交时，必须通过-m参数指定以哪个父节点作为基准来应用变更（通常-m 1代表合并前的目标分支，也就是staging分支的原有HEAD）。而当前使用的tibdex/backport@v2默认未开启合并提交支持，也未指定mainline参数，导致cherry-pick执行失败。

解决方案 #

修改GitHub Actions工作流，给backport action添加两个关键参数：

• merge_commits: true：允许action处理合并提交
• mainline: 1：指定合并提交的基准父节点为第一个父节点（对应staging分支）

修改后的工作流配置：

name: Backport
on:
  pull_request_target:
    types:
      - closed
      - labeled

jobs:
  backport:
    name: Backport
    runs-on: ubuntu-latest
    if: >
      github.event.pull_request.merged
      && (
        github.event.action == 'closed'
        || (
          github.event.action == 'labeled'
          && contains(github.event.label.name, 'backport')
        )
      )
    steps:
      - uses: tibdex/backport@v2
        with:
          github_token: ${{ secrets.GIT_BACKPORT }}
          merge_commits: true
          mainline: 1

备选方案（直接分支合并） #

如果需求是将staging分支的所有变更同步到main（而非仅cherry-pick特定PR提交），可以替换backport action，直接用Git命令完成合并：

name: Sync staging to main
on:
  push:
    branches:
      - staging

jobs:
  sync-to-main:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
        with:
          fetch-depth: 0

      - name: Sync staging to main
        run: |
          git config user.name "GitHub Actions"
          git config user.email "actions@github.com"
          git checkout main
          git merge staging --no-edit
          git push origin main
        env:
          GITHUB_TOKEN: ${{ secrets.GIT_BACKPORT }}

这种方式更直接，但需注意：若main和staging存在代码冲突，工作流会失败，需要手动处理冲突或添加冲突自动解决逻辑。

内容的提问来源于stack exchange，提问作者karthik