Token导航 LogoToken导航TokenDH.com
中转站排行榜
待分类需要联网github未标认证来源可访问许可证需确认审计通过

git-trunk-based-workflow（基于 git trunk 的工作流程）

Agent Skill

git-trunk-based-workflow 用于处理 GitHub 仓库、Issue、Pull Request 和代码协作信息，适合在 Codex、Claude、Cursor、Gemini CLI 中需要围绕仓库状态、代码变更或协作事项进行整理时使用。可结合来源仓库、安装命令和原始 README 继续核验具体用法。安装前建议确认权限范围、维护状态，以及是否会触发联网、命令执行或文件读写。

总安装

222

周安装

9

GitHub Stars

1

下载量

70
CodexClaudeCursorGemini CLI

安装说明

本站只整理中文说明和来源信息，不托管安装包，也不代用户安装。

GitHub

来源数

2

许可证

unknown

最后核验

2026-05-01

来源状态

来源可访问

安装方式

通过对话安装

复制提示词发给支持本地命令或 Skills 的 AI 助手，先确认命令和权限，再让它执行。

请帮我安装这个 Agent Skill：git-trunk-based-workflow（基于 git trunk 的工作流程）
来源仓库：https://github.com/octivi/skills
仓库路径：skills/git-trunk-based-workflow
安装命令：
npx skills add https://github.com/octivi/skills --skill git-trunk-based-workflow
安装前请先检查当前环境是否支持对应 CLI，并向我确认将要执行的命令、安装目录、联网范围和文件读写权限；确认后再执行。

命令行安装

复制命令到本机终端执行。该命令会通过 npx skills 从第三方来源获取 Skill；本站只展示命令，不托管安装包，也不自动执行。

skills.shnpx skills
npx skills add https://github.com/octivi/skills --skill git-trunk-based-workflow

简介

git-trunk-based-workflow 用于处理 GitHub 仓库、Issue、Pull Request 和代码协作信息，适合围绕仓库状态和协作事项进行整理。

  • 适用于采用主干开发模式、实施持续集成或减少分支复杂度的场景。
  • 通过 GitHub 仓库安装，使用 npx skills add 命令添加，需参考原始 README 获取详细用法。
  • 安装前建议确认权限范围、维护状态，以及是否会触发联网、命令执行或文件读写操作。
  • 适用宿主包括 Codex、Claude、Cursor、Gemini CLI，接入前应确认版本、权限和运行环境要求。

SKILL.md

Git Trunk-Based Workflow

Guide contributors through a safe trunk-based Git workflow.

Goal

Keep main releasable while integrating small changes frequently and predictably.

Canonical rules table

Use this table as the single source of truth for workflow decisions.

IDScopeRequirement
WF-1Trunk policyNever commit directly to main; use short-lived feature branches and pull requests.
WF-2Branch lifecycleFeature branches SHOULD stay focused and short-lived; delete branches after merge.
WF-3IntegrationRebase feature branch on top of main frequently to minimize integration drift.
WF-4History rewriteIf branch history was rewritten (rebase/squash), push with --force-with-lease only.
WF-5PR qualityOpen PR to main, keep CI green, and address review feedback before merge.
WF-6Merge modePrefer standard repository merge path (typically GitHub UI) unless local merge is required.
WF-7CleanupAfter merge, clean up local/remote branch references.
WF-8SafetyCommands provided to users MUST be copy-paste ready and scoped to their current step.
WF-9PreflightBefore branch operations, verify current branch and working tree state.
WF-10Conflict recoveryRebase guidance MUST include safe conflict resolution (--continue / --abort).

Branch state preflight

Run before creating/rebasing/merging branches:

git branch --show-current
git status --short

If working tree is not clean, pause and either commit, stash, or discard changes before proceeding.

Rebase conflict handling

When git rebase stops on conflict:

git status
# resolve conflicts in files
git add <resolved-file>...
git rebase --continue

If you need to cancel the rebase:

git rebase --abort

Authoring workflow

  1. Run Branch state preflight and confirm current goal.
  2. Create or switch to a short-lived feature branch from up-to-date main.
  3. Commit and push incremental progress to the feature branch.
  4. Rebase feature branch onto main frequently (use --rebase-merges only when needed).
  5. If rebase conflicts occur, execute Rebase conflict handling.
  6. Optionally clean branch history before opening PR.
  7. Open and land PR to main with green CI and addressed feedback.
  8. Clean up merged branches locally and remotely.

For full command sequences and edge-case notes, use references/git-workflow.md.

Out of scope

  • Commit message wording/formatting and Conventional Commits phrasing belong to git-commits.

Quality checklist

  • Guidance conforms to all applicable WF-* rules.
  • Commands are copy-paste ready and ordered by execution flow.
  • No recommendation conflicts with repository branch policy (main as trunk).
  • Preflight and rebase conflict recovery commands are included when relevant.
  • If user asks about commit message style, explicitly route to git-commits.

Prompt templates

  • Propose a trunk-based git workflow for implementing this task from branch creation to merge.
  • Review my current git commands and rewrite them to follow a safe rebase + PR flow on main.
  • Give me a step-by-step checklist to clean up history and merge this feature branch into main.

References

适合场景

01

用户想查找某类 Agent Skill 时

02

需要根据任务场景推荐可安装能力包时

03

需要对比不同来源的安装命令和来源信息时

能力概览

能力 1

按任务关键词查找相关 Skills

能力 2

展示可复制的安装命令

能力 3

保留来源站点、仓库和原始说明，方便继续核验

能力 4

展示第三方安全扫描或审计结果

安装后应在对应宿主中按原始 README 的触发条件使用；具体调用方式请以来源页面和 README 为准。

平台分布

Codex

36.95%
按下载量换算26

Claude

30.12%
按下载量换算21

Cursor

19.6%
按下载量换算14

Gemini CLI

10.31%
按下载量换算7

安全审计

Gen Agent Trust Hub

通过

Socket

通过

Snyk

通过

权限和风险

需要联网

该 Skill 可能需要联网访问来源站点、仓库或外部 API；具体网络访问范围需要结合源码和 README 复核。

安装前确认

本站仅展示第三方公开信息，不托管安装包，不提供自动安装或运行环境。安装前应自行审查源码、依赖和命令行为。当前只有一个来源，正式发布前建议补源仓库或其他目录站核验。

来源信息

GitHub 仓库

github.com

/octivi/skills

SKILL.md 来源

github.com

/octivi/skills/tree/main/skills/git-trunk-based-workflow

skills-sh

skills.sh

/octivi/skills/git-trunk-based-workflow

继续浏览同类 Skills

更多待分类 Skills（11,209）返回 Skills 目录

上一个 Skill

git-sync-main（git 同步主）

git-sync-main 用于处理 GitHub 仓库、Issue、Pull Request 和代码协作信息，适合在 Codex、Claude、Cursor、Gemini CLI 中需要围绕仓库状态、代码变更或协作事项进行整理时使用。可结合来源仓库、安装命令和原始 README 继续核验具体用法。安装前建议确认权限范围、维护状态，以及是否会触发联网、命令执行或文件读写。

下一个 Skill

git-upstream-pr（git 上游 pr）

git-upstream-pr 用于处理 GitHub 仓库、Issue、Pull Request 和代码协作信息，适合在 Codex、Claude、Cursor、Gemini CLI 中需要围绕仓库状态、代码变更或协作事项进行整理时使用。可结合来源仓库、安装命令和原始 README 继续核验具体用法。安装前建议确认权限范围、维护状态，以及是否会触发联网、命令执行或文件读写。