跳到正文
cccskills
免费在 GitHub 公开

merge-master

Merge dev branch into master/main and push. Use when dev changes are ready for production branch. Invoked by saying "merge to master" or "merge to main".

中文简介正在准备中。当前显示原文说明。

查看安装方法

包含的文件(1)

  • SKILL.md1.1 KB

SKILL.md(原文)

安装前可以查看交给 AI 代理的指令内容。

Merge Dev into Master

Merge the dev branch into master (or main) and push. Includes safety checks.


Steps

  1. Ensure all dev changes are pushed — run git status and git log origin/dev..dev. If there are unpushed commits, push them first (with user approval).

  2. Switch to master/main:

    git checkout master   # or main
    git pull origin master
    
  3. Merge dev:

    git merge dev --no-ff -m "merge(dev→master): <summary>"
    

    If there are conflicts, report them and wait for user instructions.

  4. Push master:

    git push origin master
    
  5. Switch back to dev:

    git checkout dev
    

Rules

  • Only merge pushed changes. Never merge uncommitted or unpushed work.
  • Never force push to master/main.
  • If merge conflicts occur, STOP and report. Do not auto-resolve.
  • Always push immediately after merging.
  • Switch back to dev when done.

评价

还没有评价。欢迎分享你的使用感受。

评论

无需登录即可发表。欢迎分享使用感受、提问,或说明在哪些环境下无法运行。

还没有评论。来写第一条吧。

提交后会立即公开。请勿填写邮箱、电话等个人信息。URL 最多 2 个。

0 / 1000 字

此表单受 reCAPTCHA 保护,适用 Google 的隐私权政策和服务条款。

同一仓库的技能

commit

免费

Stage, commit, and push code changes with branch safety and explicit staging. Use when ready to commit work. Invoked by saying "commit", "push", or "commit and push".

中文简介正在准备中。当前显示原文说明。

savedpixel/ai-agent-rules-generator82026年4月12日 更新

Batch-commit all uncommitted changes grouped by relevance. Use when multiple accumulated changes need committing. Invoked by saying "commit all" or "commit everything".

中文简介正在准备中。当前显示原文说明。

savedpixel/ai-agent-rules-generator82026年4月12日 更新

Document completed work — update task log, sync documentation, log observations. Use after finishing a task or batch of changes.

中文简介正在准备中。当前显示原文说明。

savedpixel/ai-agent-rules-generator82026年4月12日 更新

Execute a previously created implementation plan — implement, test, document, and close out. Use when a plan file exists and is ready for implementation.

中文简介正在准备中。当前显示原文说明。

savedpixel/ai-agent-rules-generator82026年4月12日 更新

plan-task

免费

Create a detailed implementation plan before coding. Use when starting a new feature, multi-step refactor, or complex task. Invoked by saying "plan", "create a plan", or "plan this task".

中文简介正在准备中。当前显示原文说明。

savedpixel/ai-agent-rules-generator82026年4月12日 更新

report

免费

Generate a structured report on completed work, a feature area, or a topic. Saved to the reports directory. Invoked by saying "report", "generate report", or "summarize work".

中文简介正在准备中。当前显示原文说明。

savedpixel/ai-agent-rules-generator82026年4月12日 更新

查看 savedpixel 的全部技能

报告此技能的问题