Git Merge 2024
I have a special place in my heart for Git Merge, as I helped create it (and possibly name it, though that is up for debate) way back in 2013. This year it looked as though it might not happen again, which prompted the GitButler team to see if we could help make sure the event takes place.
The conference was broken up into three parts - the talks day, an un-conference day and a contributor's summit. What transpired was an un-matched version control nerd-fest.
On day one we had 12 speakers who were selected via an RFP process by GitHub's Taylor Blau and myself. Each spoke for 20 minutes, which made for a fast, fun set of Git related talks.
The second day was run as an un-conference. Everyone wrote up and voted on potential 45 minute breakout talks, the crowd self-organized which talks would be in which rooms at what time, and that was the schedule of the day.
These talks ranged from new ideas for the Git user interface inspired by Meta's Sapling project, ideas for resumable pushes, new large file support concepts, and more. GitButler and the Jujutsu team led a discussion around "fearless rebasing", which was one of my personal highlights of the conference.
