agentleFS
r1n7aror1n7aro/Locus/skills/merge/SKILL.md

merge

Skill759 starsChanged 5 months agoGPL-3.0View on GitHub

把用户选定的改动整合到目标中,保留目标已有且未要求替换的工作。修改内容与 Git 历史处理是两个选择;按用户已有要求完成,不在每一步重新征求确认。 一次读取目标 checkout、当前分支、暂存/未暂存状态、正在进行的 Git 操作,以及所选来源的提交列表与提交说明。变更路径、与目标的重叠、已应用项和冲突以 prepare 后的 catalog 为准,不再用 git diff/comm 另算一遍;只对 catalog 和 preview 标出的问题展开具体文件。本地 ref 足够时不额外 fetch。 目标默认是当前工作区,不为了合并先切换分支。把来源 ref 一次解析为 commit OID,明确选取范围与依赖顺序;非连续选择不把中间未选提交带入。遇到 merge commit 时指定正确的 mainline,细节按需查…

54 other projects use a version of this.

Adopted by

Most recently taken up by

Used with

Projects with it also use addskill, apply-firmware and 10 more.

Other files people use alongside this one.

Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
  • ryanportfolioSkill

    addskill

    Create, import, update, or install repo or personal skills: runtime ownership, resources, discovery checks.

    Also in 6 projects that use this

  • ryanportfolioSkill

    apply-firmware

    Bring current folder (plain folder, existing repo, old or partial firmware copy) up to full Harness Firmware in place. Mirror external repo → adopt-repo.

    Also in 6 projects that use this

  • +10 more from ryanportfolio

The file

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.