Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content and user case studies, plus a day of workshops for Git users of all levels. Git Merge 2017 will take place February 2-3 in Brussels.
Git Merge is dedicated to amplifying new voices in the Git community and to showcasing the most thought-provoking projects from contributors, maintainers and community managers around the world.
Executive Director, Software Freedom Conservancy
Karen M. Sandler is the executive director of the Software Freedom Conservancy. Karen is known for her advocacy for free software, particularly as a cyborg in relation to the software on medical devices. Prior to joining Conservancy, she was executive director of the GNOME Foundation. Before that, she was general counsel of the Software Freedom Law Center. Karen co-organizes Outreachy, the award-winning outreach program for women. She is also pro bono lawyer to the FSF and GNOME. Karen is a recipient of the O’Reilly Open Source Award and cohost of the oggcast Free as in Freedom.
10:00 - 10:30 Intro & Welcome - Software Freedom Conservancy
Infrastructure Engineer, GitHub
Carlos works in the Git Infrastructure team, responsible for keeping the Git data safe and accessible.
10:45 - 11:15 Top Ten Worst Repositories to host on GitHub
Principal Program Manager, Visual Studio Team Services, Microsoft
Saeed is on the Visual Studio Team Services team at Microsoft, focused on helping some very large teams within Microsoft migrate to Git. Among other things, this means solving some hard scale problems in Git, which is a great source of fun. He also enjoys rock climbing, road biking, and music.
11:15 - 11:45 Scaling Git at Microsoft
PhD student, Software Design Group, MIT
Santiago P. De Rosso is a PhD student in the Software Design Group at MIT. He used to work at Google, developing tools to make engineers more productive. He currently spends most of his time thinking about how to make software, and the process of software engineering, better.
11:45 - 12:15 What’s Wrong With Git?
Implementation Engineer, BazaarVoice
Caren is an Implementation Engineer at BazaarVoice in Austin, Texas. She's an organizer for her local chapter of Women Who Code, a perennial optimist and enjoys delicious German beers, fika, tacos and travel. She is an Alumna and Teaching Assistant at the University of Texas.
13:30 - 14:00 Git: The Tool Loved and (sometimes) Feared
Tech Lead, Source Control, Facebook
Durham is the tech lead on the Source Control team at Facebook. He has spent the past 4 years making distributed version control scale to some of the largest repositories in the world. He has helped teach thousands of engineers to use source control and has a keen interest in making it more approachable to everyone.
Technical Lead, Git Solutions, Autodesk
Lars is the technical lead for Git at Autodesk, working out of Berlin, Germany. His current work involves migrating large codebases to Git, establishing Git workflows within teams, and maintaining a GitHub Enterprise instance. He is a Git contributor, the author of the ShowInGitHub Xcode plugin, and an avid kiteboarder.
14:45 - 15:15 Git LFS at Light Speed
Bitbucket Developer, Atlassian
Tim is a Bitbucket developer by day, and Git evangelist by night. His current technology passions are serverless architecture, Git, Node.js, game dev, and DevOps - but he'll talk to you about anything shiny and tech-related really. When Tim's not developing or talking about code, he likes riding mountain bikes and eating good Mexican food, which is unfortunate because he lives 13,000km from Mexico. Tim writes about all things Git here, here, here, and sometimes here -- and way too much here
15:15 - 15:45 Git Aliases of the Gods!
Senior Software Developer and Engineering Manager, SUSE Linux
Cornelius has been an open source contributor for more than a decade. He currently works for SUSE Linux as a Senior Software Developer and Engineering Manager, and he is a committer to Cloud Foundry.
16:30 - 17:00 Git for Pair Programming
Software Developer, Yubico
Thordur Bjornsson is a pragmatic and result-oriented developer who cares deeply about resilience, robustness, and reliability. He has over a decade of experience hacking on databases, protocols, storage, and open source operating systems.
17:00 - 17:30 Trust But Verify
In this talk we'll see what technologies GitHub has developed to handle the more challenging repositories and use-cases, from heuristics to replication and quotas, as well as what it takes to backup this data.
Over the last year, we have continued to invest in Git and have lots of exciting information to share about the work we’ve done to embrace Git across the company, for teams of any size. During this talk, we plan to discuss, in depth, how we are using git internally with a specific focus on large repositories. We’ll discuss the architecture of VSTS’s git server which is built on Azure and the customizations we’ve had to make to both it and git.exe in order to enable git to scale further and further. These customizations will cover changes that we’ve contributed back to the git core open source project as well as changes that we haven’t talked about externally yet. We’ll also lay out a roadmap for the next steps that we plan to take to deal with repositories that are significantly larger than git can scale to today.
Git is powerful but complicated, especially for novices. In this talk, we are going to apply a new theory of design, that focuses on the purposes and concepts underlying software, to explain well-known difficulties with Git---and suggest ways in which Git could be made easier to learn and use.
This talk will showcase how Git can be used for the classroom, for writers and professionals that can benefit from using Git for their work.
Facebook uses Mercurial to host some of the largest, fastest growing distributed version control repositories in the world. Over the past four years we’ve dealt with numerous scaling challenges, ranging from the number of commits per minute to creating robust, redundant server infrastructure. We’ve also introduced significant user experience improvements to make it easier to ramp up new engineers and to make power-user workflows more accessible to everyone. In this session we’ll talk about the specific technical and user experience improvements we’ve open sourced to handle our growing scale, with an emphasis on the lessons learned that could be valuable to Git and the Git community.
Git and its extensions are becoming more popular than ever. However, certain use cases may still be suboptimal. We identified a way to dramatically improve performance in a popular Git extension - LFS (Large File Storage) - that required changes in both Git Core, and the extension itself. Based on our combined experiences we’ll walk you through the process of a successful contribution to each project with the help of mailing lists and Pull Requests. If you have already a bit of Git command line knowledge then this talk will prepare you for your first contribution to Git, an extension, or both.
With five major releases this year, the Git project's incredible velocity and iron-clad backwards compatibility are something of a paradox. How does a CLI tool introduce hundreds of new features without changing its existing behavior? With command-line options of course! The downside of this is that Git now has literally thousands of options littering its main pages. The only way to master them is through the ancient art of aliasing.
We'll cover the nuts and bolts of creating aliases including parameter handling, incorporating multiple commands in the same alias, and tweaking the behavior of Git through options, environment, and inline configuration overrides. Then we'll move on to the fun part: a bestiary of aliases. These are not your mother's git config alias.co checkout! I've scoured dark corners of the web, freenode, and social media to uncover mystic aliases that perform every function from automating your team's standup meeting to I'm feeling lucky searches across your DAG. We'll break apart each alias in turn, and dissect their guts to understand how it does what it does.
Some people love it, some people hate it, and some people are even doing it: pair programming. That means two people, one computer. Git doesn't support this workflow natively, but there are workarounds and best practices how to do productive pair programming with git. This presentation will give an overview of how this works with practical insights of one of the biggest open source projects using pair programming as its primary means of development. It will include a sketch and discussion how git could get native support for pair programming.
This talk will cover the details on how to cryptographically sign your work; from PGP fundamentals and best practices, what gets signed and how to verify those signatures, to possible impacts, and benefits to your workflow. We’ll also take a look at Github’s interface changes from earlier this year that added visual cues to highlight verification status of commits and tags.
Git users of all levels are invited to deep-dive into a variety of topics with some of the best Git trainers in the world.
Please note workshops are currently full. To add your name to the waitlist, please email us and we will contact you if a spot becomes available.
Doors open at 8:30 on Feb 2nd. Please be sure to arrive in time to pick up your badge and enjoy breakfast before workshops kick off at 9:30am
We searched the world over for the gnarliest, most terrifying git scenarios we could find. In this caffeine fueled session, you will learn how to use some of the more advanced porcelain commands to detangle all the things and become the git hero you were born to be.
Submodules or Subtrees? Both are proposed as solutions for handling dependencies with Git. In this session the gloves are coming off, which one will win it all?
Learn to channel the git force and improve your workflows using customized configurations, attributes and hooks.
You are already the go-to "Git person" among friends and colleagues, but where do you go when you are stumped, or simply want to bounce ideas off the people who really know Git? At GitHub we are lucky to have that option; we work alongside several core maintainers and they hang out in an internal Slack channel called #git-users to answer the really hard questions. This session features some of the "greatest hits" from discussions in that channel over the last year, covering everything from plumbing commands and workflow advice, to thoughts on designing new Git tooling.
Is your repo out of control? Is it so unwieldy and awkward you are embarrassed to be seen with it? It's time to take control ... learn how to clean up your repository with filter-branch and BFG, then use git-lfs for a healthier tomorrow.
Git can seem unapproachable to new users. Even more seasoned users can forget the simplicity that underpins Git. In this session, we will write the remedial functionalities of Git in Ruby. Because of Ruby's approachable syntax no previous Ruby experience is needed to follow this talk.
Situated in the heart of Brussels, The Egg is a short distance from the Midi/Zuid Station.
Bara Street 175, 1070 Brussels, Belgium
Date & Time
February 3, 8-11pm
Brussels Event Brewery
Rue Delaunoy 58
The Git Merge 2017 Afterparty will be held at the Brussels Event Brewery Silos, a former brewery known for its world-famous cherry beer, dating back to 1913. Join us for a custom beer and chocolate tasting experience and a selection of late-night snacks.
Bruxelles-Midi/Zuid, served by Thalys, Eurostar, TGV®, and ICE trains
Street parking is available, but we recommend using a car share service such as Uber
By public transport
Stib, De Lijn, TEC
Brussels has a large selection of hotels in every price range, and many within walking distance of the Egg. We are in the process of negotiating a discounted rate for attendees. Check back soon for more details.