attic-git
Skill5 starsChanged 2 months agoMITView on GitHub
Everything about .attic/ and git: fixes merge conflicts in INDEX.md and DECISIONS.md by installing a union merge driver, and sets up a shared attic for a team. Use whenever git and .attic/ appear in the same problem: "merge conflicts in INDEX.md", "the attic keeps conflicting", "conflict in DECISIONS.md", "share the attic with my team", "commit the attic", "onboard someone to our attic".
In this repository12 other files it gives its agents.
- attic-doctorSkill
- attic-failSkill
- attic-helpSkill
- attic-indexSkill
- attic-pinSkill
- attic-pruneSkill
- attic-recallSkill
- attic-reviewSkill
- atticSkill
- attic-stashSkill
- attic-statsSkill
- attic-sweepSkill
The file
We split this skill into the rules it gives an agent
4 rules. About 0 are common, 2 are distinctive, and 2 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈2
Distinctive · estimate
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
- could be automatic: a setting could enforce it
- Very specific: line 20
Add to the repository's .gitattributes (create it if absent):
- Distinctive: line 39
Verify by describing the check, or running it in a scratch clone: two branches each appending an item should merge with no conflict markers.
- Very specific: line 48
A committed attic is in git history: If a credential ever reaches it, rotating the credential is the fix.
- Distinctive: line 51
If someone declines the merge driver, warn them that conflicts on INDEX.md will be frequent and that resolving them by picking one side …
≈ “Common” is an estimate: at least 1 in 5 of the 372,429 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Attic and git
.attic/INDEX.md and DECISIONS.md are append-only, so two branches that
each stash something will conflict on every merge. The fix is a union merge
driver.
- Add to the repository's
.gitattributes(create it if absent):
.attic/INDEX.md merge=attic
.attic/DECISIONS.md merge=attic- Each developer runs this once per clone. Git does not allow a repository to configure a driver command for security reasons, so this cannot be automated for them:
git config merge.attic.name "attic union merge"
git config merge.attic.driver "node <path-to-plugin>/scripts/attic-merge.js %O %A %B %P"Resolve <path-to-plugin> from ${CLAUDE_SKILL_DIR}/../.. and show the
real path in the command you print.
- Verify by describing the check, or running it in a scratch clone: two branches each appending an item should merge with no conflict markers.
Then tell the user what to commit, from docs/TEAM.md:
- Commit
.attic/INDEX.md,.attic/items/,.attic/DECISIONS.mdfor shared memory. - Consider gitignoring
.attic/items/session-*.md, which are personal working state and rarely useful to others. - A committed attic is in git history. If a credential ever reaches it, rotating the credential is the fix. Removing the file is not enough.
If someone declines the merge driver, warn them that conflicts on INDEX.md will be frequent and that resolving them by picking one side silently loses the other side's items.
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
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.

