Today we're happy to announce that we're once again helping to host the Git Merge conference, this time in beautiful Lisbon, Portugal! Join us on September 17 and 18th for some Git nerdery.
If you're not familiar with Git Merge, it's a conference that I helped organize at GitHub for the first time way back in 2013. It's a chance for people working on Git, or building things on top of Git, or who just think Git stuff is cool, to get together and nerd out on Git stuff.
GitButler helped host Git Merge 2024 in Berlin and we're back, with the help of GitHub, GitLab and Google, to host it in Europe once again.
Some example talks from 2024 included Taylor Blau talking about how to scale Git:
Or Sebastian Thiel giving us the rundown on Gitoxide, the Rust implementation of Git:
Or Patrick "Steiny" Steinhardt introducing us to the new reftable backend:
You can watch all the 2024 and 2025 Git Merge talks, as well as the 2025 Git mini-summit talks on our YouTube channel.
Some Jujutsu flavor
Additionally, since our good friends working on Jujutsu also wanted to get together around this time, we decided to "merge" and are additionally hosting a JJ Day in conjunction with the Git Merge conference. If you are a JJ fan, the whole first day will be dedicated specifically to that.
Registration and CFP
Check out the new Git Merge 2026 website, throw a talk proposal at our CFP, or just register to join us in Lisbon!
Written by Scott Chacon
Scott Chacon is a co-founder of GitHub and GitButler, where he builds innovative tools for modern version control. He has authored Pro Git and spoken globally on Git and software collaboration.
More to Read
Agent-safe Git with GitButler
How to let coding agents work without wrecking your branches: the real fear is not the code, it’s the Git mess, and the fix is a workflow built for safe review, rollback, and clear task boundaries.
We’ve raised $17M to build what comes after Git
GitButler has raised a Series A round to accelerate developing the infrastructure for how software gets built next.
The Great CSS Expansion
CSS now does what Floating UI, GSAP ScrollTrigger, Framer Motion, and react-select used to require JavaScript for. Here is exactly how much that saves, why these libraries were painful beyond their size, and what the platform still hasn't figured out.