Skip to content
Skills Library
Programming · Tool integration

attic-git

/attic-git

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".

Repository
attic ↗
Licence
MIT
Last repository change
23.09.2026

Assessment and security

96/ 100Class: good
Format25 / 25
Frontmatter with name and description, valid name, description up to 1,024 characters, name matching the folder.
Discoverability25 / 25
Description explains when to use the skill, has a reasonable length and uses third person.
Content31 / 35
At least 150 words and at most 500 lines, headings, step lists, examples or code.
Hygiene15 / 15
No placeholders such as TODO, no Windows paths, with a licence.
Riskno signals detected in the scan
Files in this package
1
Scripts
0
HTML comments
0
URLs in SKILL.md
0
Deprecation

No signals detected. Repository changed on 23.09.2026, without references to retired models or APIs.

Licence

MIT, open: use and modify while retaining author attribution.

What it does and when to use it

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".

Triggers from the description

merge conflicts in INDEX.mdthe attic keeps conflictingconflict in DECISIONS.mdshare the attic with my teamcommit the atticonboard someone to our attic
Original author description

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".

How it works

SKILL.md has no level-two headings · 48 lines, 243 words

SKILL.md preview
---
name: attic-git
description: >
  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".
version: 1.6.1
license: MIT
---

# Attic and git

First, in the same shell command as anything below, locate the script:

```bash
ATTIC_JS=$(ls -d "${CODEX_HOME:-$HOME/.codex}"/plugins/cache/attic/attic/*/skills/attic/scripts/attic.js "${CODEX_HOME:-$HOME/.codex}"/skills/attic/scripts/attic.js "$HOME"/.agents/skills/attic/scripts/attic.js .agents/skills/attic/scripts/attic.js 2>/dev/null | sort -V | tail -1)
```

`.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.

1. Add to the repository's `.gitattributes` (create it if absent):

```
.attic/INDEX.md merge=attic
.attic/DECISIONS.md merge=attic
```

2. 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:

```bash
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 `$(dirname "$ATTIC_JS")/../../..` and show the
   real path in the command you print.

3. 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.md` for
  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.

Versions

RepositoryScoreLicence
This page · nishikantaray/attic96MIT
nishikantaray/attic96MIT

Database snapshot: 13.11.2026 · package version 11e54e31e893 (SHA-256 digest of the entire package)

Downloads in the last 30 days: 0 · ranking

Report a problem with this skill: harmful content, incorrect descriptions or an author’s removal request.

Similar skills

  • 91attic-doctor
    Check the CONTENTS of .attic/ for drift: orphaned items, stale index lines, malformed frontmatter, oversized hooks, and leaked credentials. Use when the user says "check the attic", "attic doctor", "is the attic healthy", or "did anything leak into the attic". Never use this for…
  • 91attic-doctor
    Check the CONTENTS of .attic/ for drift: orphaned items, stale index lines, malformed frontmatter, oversized hooks, and leaked credentials. Use when the user says "check the attic", "attic doctor", "is the attic healthy", or "did anything leak into the attic". Never use this for…
  • 96resolving-merge-conflicts
    Use when you need to resolve an in-progress git merge/rebase conflict.
  • 96resolving-merge-conflicts
    Use when you need to resolve an in-progress git merge/rebase conflict.
  • 82resolving-merge-conflicts
    Use when you need to resolve an in-progress git merge/rebase conflict.
  • 91resolving-merge-conflicts
    Use when you need to resolve an in-progress git merge/rebase conflict.

Feedback and reports

Your message goes to Bartosz Sokoliński. An email address is needed only for a reply. See the privacy policy.