merge
Skill0 starsChanged 57 days agoMITView on GitHub
Merge changes from the topic branch to the merge base branch. Use when the user wants to merge their session's work back to the base branch.
58 other projects use a version of this.
Adopted by
Most recently taken up by
- onetimesecret/onetimesecrettheir own version, first seen Nov 16, 2026
- Kealman/cland-v0their own version, first seen Nov 15, 2026
- Trixx4191/asrartheir own version, first seen Nov 15, 2026
- automagik-si/genietheir own version, first seen Nov 15, 2026
- ryanportfolio/Corewise.Academytheir own version, first seen Nov 12, 2026
- ToolJet/ToolJettheir own version, first seen Nov 12, 2026
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.
ryanportfolioSkilladdskill
Create, import, update, or install repo or personal skills: runtime ownership, resources, discovery checks.
Also in 6 projects that use this
ryanportfolioSkillapply-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
Other versions58 projects use a version of this.
Word for word · 2
- microsoft/vscode★ 195k100% same
- patterson-agents/skills★ 0100% same
Edited · 0
None found.
Wrote their own version · 56
- remotion-dev/remotion★ 73ksame name
- withastro/astro★ 64ksame name
- ToolJet/ToolJet★ 41ksame name
- Openpanel-dev/openpanel★ 7.3ksame name
- raine/workmux★ 3ksame name
- onetimesecret/onetimesecret★ 3ksame name
- jtenniswood/espcontrol★ 1.2ksame name
- K9i-0/ccpocket★ 1.1ksame name
- r1n7aro/Locus★ 759same name
- automagik-dev/genie★ 353same name
46 more not listed
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository32 other files it gives its agents.
- .github/copilot-instructions.mdCopilot instructions
- act-on-feedbackSkill
- algorithmic-artSkill
- animateSkill
- canvas-designSkill
- coderSkill
- code-reviewSkill
- coderSkill
- commitSkill
- create-draft-prSkill
- create-prSkill
- criticSkill
- designerSkill
- design-taste-frontendSkill
- fix-ciSkill
- frontend-designSkill
- generalistSkill
- generate-run-commandsSkill
- ponytailSkill
- researcherSkill
- researcherSkill
- securitySkill
- shadcnSkill
- syncSkill
- sync-upstreamSkill
- theme-factorySkill
- toolsSkill
- troubleshootSkill
- ui-ux-pro-maxSkill
- update-prSkill
- update-skillsSkill
- web-design-engineerSkill
The file
We split this skill into the rules it gives an agent
6 rules. 0 are common, 4 are distinctive, and 2 are very specific to this project.
0
Common
Most of the 50 edited versions we read keep these.
4
Distinctive
This author's own choices. Worth a look.
2
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Distinctive: line 16
When in doubt about conflict resolution — ask the user.
- Distinctive: line 22
Check for uncommitted changes in the current worktree:
- Very specific: line 26
If there are uncommitted changes, use the /commit skill to commit them before continuing.
- Very specific: line 30
Use git -C <main-worktree-path> to run commands against the main worktree without leaving the current worktree.
- Distinctive: line 38
If the merge reports conflicts:
- Distinctive: line 62
After the merge completes, verify the result:
“Common” is measured: kept by at least 6 in 10 of the 50 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. -->Merge Changes
Merge the topic branch (checked out in the current worktree) into the merge base branch (checked out in the main worktree). The context block appended to the prompt contains the source branch, target branch, and main worktree path.
Guidelines
- Never force-push (
--force,--force-with-lease) without explicit user approval. - Never skip pre-push hooks (do not use
--no-verify). - Never rewrite or drop commits without asking the user.
- When in doubt about conflict resolution — ask the user.
Workflow
1. Commit uncommitted changes in the current worktree
Check for uncommitted changes in the current worktree:
git status --porcelainIf there are uncommitted changes, use the /commit skill to commit them before continuing.
2. Merge the topic branch into the base branch
Use git -C <main-worktree-path> to run commands against the main worktree without leaving the current worktree.
git -C <main-worktree-path> merge <topic-branch>3. Handle merge conflicts
If the merge reports conflicts:
3.1. List conflicted files:
git -C <main-worktree-path> diff --name-only --diff-filter=U3.2. For each conflicted file, read the file content, resolve the conflict by preserving the intent of both sides, and stage the resolved file:
git -C <main-worktree-path> add <resolved-file>3.3. When in doubt on how to resolve a merge conflict, ask the user for guidance. If the user wants to abort, run:
git -C <main-worktree-path> merge --abort3.4. Once all conflicts are resolved and staged, commit the merge:
git -C <main-worktree-path> commit --no-editValidation
After the merge completes, verify the result:
- Confirm the main worktree is clean:
git -C <main-worktree-path> status --porcelain- Confirm the topic branch is an ancestor of the base branch (i.e. all commits are merged):
git -C <main-worktree-path> merge-base --is-ancestor <topic-branch> HEADDoes 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
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.

