Advent Day 7: Git Merge

This is day 7 of my Git Tips and Tricks Advent Calendar. If you want to see the whole list of tips as they're published, see the index.

The annual Git Merge conference is one of my favorites of the year. Git developers and users get together to hack, share tips, and plan the future. Over the past five Git Merge events, we've seen a few product announcements, several talks on how to scale Git, and many talks, about using Git.

Unfortunately, I can't make it this year, but you can. It's coming up January 31 and February 1 in Brussels and it's going to be great.

But you don't have to take my word for it, my friends at Praqma have written up trip reports from both Git Merge 2017 and Git Merge 2018.

And if you want to see what you've been missing over the past few years, check out the previous talks:

• Git Merge 2018
• Git Merge 2017
• Git Merge 2016
• Git Merge 2015
• Git Merge 2013

I hope you'll be able to make it in my place!