鱼皮AI导航
鱼皮AI导航
  • 主页
  • 社区
  • AI工具
  • AI知识库
  • AI提示词
  • MCP
  • Skills
  • AI学习资源
  • AI资讯
  • GitHub开源
登录/注册

backport-pr-assistant

协助将已合并的拉取请求安全迁移到旧版发布分支,尤其擅长处理合并冲突场景;支持指定目标版本、添加发布说明、筛选提交内容及强制执行,并提供冲突暂停与恢复机制,确保跨版本代码同步的准确性与可追溯性。

开发运维
访问 GitHub
文档Skills.MD
name
backport-pr-assistant
description
Help backport PRs to release branches using the backport CLI tool. Use when backporting changes that have merge conflicts requiring manual resolution.

CockroachDB Backport Assistant

Help the user backport pull requests to older release branches, especially when conflicts need resolution.

Backport CLI Tool Reference

Basic Usage:

▼
bash
复制代码
backport <pull-request>... # Backport entire PR(s) backport <pr> -r <release> # Target specific release (e.g., -r 23.2) backport <pr> -b <branch> # Target specific branch (e.g., -b release-23.1.10-rc) backport <pr> -j "justification" # Add release justification backport <pr> -c <commit> -c <commit> # Cherry-pick specific commits only backport <pr> -f # Force operation

Conflict Resolution:

▼
bash
复制代码
backport --continue # Resume after resolving conflicts backport --abort # Cancel in-progress backport

Common Examples:

▼
bash
复制代码
backport 23437 # Simple backport backport 23437 -r 23.2 # To release-23.2 branch backport 23437 -j "test-only changes" # With justification backport 23437 -b release-23.1.10-rc # To specific release candidate branch

Workflow

  1. Start the backport: Run backport <pr> -r <release> for the target branch
  2. When conflicts occur: The tool stops and lists conflicting files
  3. Analyze conflicts: Read the conflicting files, understand what's different between branches
  4. Resolve conflicts: Edit files to resolve, then git add the resolved files
  5. Continue: Run backport --continue to resume
  6. Repeat if more conflicts arise
  7. Complete: The backport tool pushes and creates the PR (do not use gh CLI to make the PR)

Conflict Resolution Guidelines

Simple conflicts you can resolve directly:

  • Import statement conflicts
  • Simple variable name changes
  • Basic formatting differences
  • Minor API signature changes that are obvious

Complex conflicts - ask the user for guidance:

  • Conflicts involving significant logic changes
  • Dependencies that don't exist in the target branch
  • API changes requiring substantial modification
  • Multiple conflicting files with interdependent changes
  • Changes that may not be appropriate for the target branch

When Resolving Conflicts

  1. Explain what's conflicting - show the relevant code sections
  2. Explain why - what's different between branches that caused this
  3. Propose a resolution - or ask for guidance if complex
  4. After resolving: git add <files> then backport --continue
开发运维

快捷安装

复制到终端去安装 Skill

npxskillsaddcockroachdb/cockroach--skill"backport-pr-assistant"
站长:程序员鱼皮 老鱼简历 商务合作 增值电信业务经营许可证
2026 鱼皮AI导航 | 沪ICP备19026706号-6
站长:程序员鱼皮 老鱼简历 商务合作 增值电信业务经营许可证
2026 鱼皮AI导航 | 沪ICP备19026706号-6
🔥热门工具
朱雀AI检测朱雀AI检测
朱雀AI检测助手朱雀AI检测助手
LovartLovart
老鱼简历老鱼简历
WritePass官网WritePass官网
面多多面多多
CursorCursor
星月写作星月写作
朱雀AI检测助手朱雀AI检测助手
零感AI零感AI
Skills 推荐
retrieving-developer-knowledge
retrieving-developer-knowledge 用于搜索、获取和整合 Google 官方开发者文档,覆盖 Google Cloud、AI/Gemini、Android、Chrome、Web、Flutter、Go、Firebase 等平台,适用于查询 gcloud CLI 命令、API 语法、IAM 权限或架构对比等场景。
diff-intake
diff-intake 读取 PR 或分支差异,生成结构化 YAML 变更摘要,用于下游 analytics instrumentation 技能。适用于用户提交 PR 链接、分支对比或原始 diff 后需理解变更内容、评估分析覆盖或启动埋点流程的场景。
load-balancer-configurator
根据用户需求自动生成各类负载均衡器的生产级配置,覆盖 ALB、NLB、Nginx 和 HAProxy 等主流类型,适配不同协议、端口、健康检查及后端服务拓扑,支持直接集成到基础设施即代码流程中。
implement
实现 Linus Dashboard 的功能开发与集成,基于 TypeScript 和 Python 构建前后端组件,遵循严格的代码规范与架构模式,完成视图、卡片、服务及传感器等模块的创建与验证,确保高质量交付并兼容 Home Assistant 生态。
cloud-scheduler-job-creator
自动处理 Google Cloud Platform 中的云调度任务创建,提供符合最佳实践的配置方案与生产级代码生成,支持计算、存储、大数据及机器学习服务的集成部署。