Git Merge 2026
Table of Contents
Placeholder. Details below are from git-merge.com; per-talk notes are not yet filled in.
Basics
| Field | Value |
|---|---|
| Event | Git Merge 2026 (v2026.0) |
| Dates | (JJ Con Sep 16) |
| Venue | Suspenso, Lisbon, Portugal (suspenso.pt) |
| Framing | In-person conference for everyone who works on or with Git |
| Hosts | GitButler, OpenAI; JJ Con by Google; social by GitLab |
| URL | https://git-merge.com/ |
Schedule
Three days: a Jujutsu pre-conference, a curated talks day, and a contributors/unconference day.
| Day | Track | What |
|---|---|---|
| Wed Sep 16 | JJ Con | Jujutsu (jj) day hosted by Google: intro sessions, Git-interop deep dives, ecosystem talks, tips |
| Thu Sep 17 | Git Talks Day | ~12 curated talks, lightning sessions, keynotes; evening social hosted by GitLab |
| Fri Sep 18 | Unconf + Summit | Attendee-run unconference on Git/VCS futures; a core-contributor summit runs in parallel |
Speakers (10 confirmed)
| Speaker | Affiliation | Talk |
|---|---|---|
| Scott Chacon | GitButler | Git Meta — The Git Notes we deserve |
| Taylor Blau | OpenAI | Git at OpenAI |
| Olamide Caleb Bello & Usman Akinyemi | Git contributors | The Libification of Git: From Global State to Repository-Aware APIs |
| Patrick Steinhardt | GitLab | Evolving Git for the Next Decade |
| Tomas Reimers | Anysphere | TBA |
| brian m. carlson | GitHub | Rust in Git: Status, Internals, and Features |
| Elijah Newren | GitHub | TBA |
| Emily Shaffer | TBA | |
| Raphaël Gomès & Pierre-Yves David | Octobus | Checking out another branch of Version Control |
| Toon Claes | GitLab | Git Smartlog: Can't See the Branches for the Trees |
Recorded: talks published a few weeks after. Student / maintainer / OSS discounts available.
Why
Three threads on this programme land on active wal.sh work.
- Jujutsu (jj) and Git interop. An entire pre-conference day on the jj model — the conflict-as-first-class, working-copy-as-commit approach to version control that reframes the merge problem the multi-agent collaboration work keeps hitting: concurrent edits to a shared artifact.
- Git at OpenAI / Anysphere / Cursor. Taylor Blau on Git at OpenAI and Tomas
Reimers (Anysphere) put the version-control substrate of agentic dev on the
main stage — the worktree-isolation and review/merge model tested hands-on
in
jwalsh/agentic-collab-lab. - Libification of Git; Rust in Git. "From Global State to Repository-Aware APIs" is the same repository-aware-API move that makes a tool safe to drive from many concurrent agents at once.
Related
- Events index
- Multi-Agent Workflow Frameworks — concurrent edits to a shared artifact
- Local-First Software — CRDTs and the collaboration substrate
- Who Does What, With Agents — human operator + agent collaboration