← All work

09 / Developer tool · solo · in planning

git-mates

A coordination layer on top of ordinary git, so several Claude Code sessions can edit one folder without tangling their commits. The project is at the research and design stage, and the public repository holds no product code yet.

View on GitHub ↗
A throwaway HTML prototype comparing a shared branch with per-session branches, with code lines marked as one session’s work in progress and another’s committed work
git-mates — throwaway prototype
Role
Solo — research and design
Status
In planning · no product code yet
Design
5 ADRs · 11 of 18 tickets resolved
Stack
Planned: Rust · Claude Code hooks · git hooks

The rule

Each session commits only its own changes, and none can wipe another's work in progress.

Build notes

Built on ordinary git

No new version control and no GitButler, because of its Fair Source licence and because agents would have to learn its CLI. A plain git commit stays the only way to commit, for agents and people alike.

One branch per session

Each session commits to its own branch, so dropping everything it did takes one branch delete. The cost is that HEAD sits on a workspace commit.

Ownership by the line

Hooks will record which session changed which lines, with no daemon watching files. Whatever cannot be traced to an agent belongs to the human session.

Record what is on disk

The workspace commit records exactly what is on disk, not a merge of the session branches, so two branches that conflict on neighbouring lines can still share the folder.

More screens

The prototype showing per-session branches that conflict on neighbouring lines and cannot be a plain mergeThe prototype blocking one session from editing a line where another session has uncommitted work

Want to work with NYX?

Build a product together, distribute one that exists, commission software, or join in — write a few lines and NYX will get back to you.

Send an invitation →