Git Merge 2019 - Brussels

Session

10:00 | Feb 1

The future of free software

Sculpting the future of technology is a big responsibility and to do it right, we're going to need lots of thoughtful people. Welcoming the next generation of free software developers and users is our most important job. Those of us who build tools *and* communities are uniquely placed to ensure an empowering future for free software and the world we're building it for!

Session

10:30 | Feb 1

Tales in scalability: how Google has seen users break Git

Google runs a Git hosting service that handles 100s of thousands of repositories of all shapes and sizes. We host Android, which contains huge binary assets and employs >1000 distinct repositories, and Chromium, a monorepo with >1750 unique committers last year. Both projects see high volumes of code review traffic and employ significant automation (build bots, auto mergers). We see bursts of >20 updates/second in individual repositories, and a bug fix in one branch can trigger a cascade of automated updates to other branches and repositories.

This talk will provide tales from the trenches of seeing Git stretched to new limits, the work that has motivated, and how Google monitors its hosting service to ensure Git can continue to scale.

Session

10:00 | Jan 31

Visualizing Git

You likely interact with Git everyday to version control your software and collaborate with others. But have you ever seen Git? Look no further: we’ll use a custom visualization tool that I built to help strengthen Git mental models. We’ll gain clarity and a deeper understanding of what’s happening to your commit graph when you do common git operations and when you interact with remote repositories. We’ll discuss the various methods of incorporating work from different branches, consequences of re-writing your branch history, and strategies for force-pushing responsibly. We’ll discuss a variety of “Oh shit” moments, and how you can recover. You’ll walk away from this workshop with a rock-solid mental model, a concrete view of Git, and the confidence to get yourself out of any tough situation.

Session

10:30 | Feb 1

Tales in scalability: how Google has seen users break Git

Google runs a Git hosting service that handles 100s of thousands of repositories of all shapes and sizes. We host Android, which contains huge binary assets and employs >1000 distinct repositories, and Chromium, a monorepo with >1750 unique committers last year. Both projects see high volumes of code review traffic and employ significant automation (build bots, auto mergers). We see bursts of >20 updates/second in individual repositories, and a bug fix in one branch can trigger a cascade of automated updates to other branches and repositories.

This talk will provide tales from the trenches of seeing Git stretched to new limits, the work that has motivated, and how Google monitors its hosting service to ensure Git can continue to scale.

Session

16:30 | Jan 31

Git Workflows

We know how to branch, commit, push and pull, but the tricky part is how these commands turn into an effective workflow for collaboration. We will cover different workflows and their benefits. More importantly we will go through the pitfalls. This workshop will help you select the right workflow to get value to your users.

11:00 | Feb 1

The what, how and why of scaling repositories

Perhaps even more controversial than rebase vs. merge is Mono vs Many-repos. During my consultancy career I've helped companies go in either directions, with good reasons for both transitions. This talk will remove the gut-feeling part of deciding your repository structure, and instead dive into the available tools and considerations for deciding what is the right repository structure for your organisation based on science and technology.

Session

11:40 | Feb 1

Bridging the gap: transitioning Git to SHA-256

Git has long used SHA-1 to identify objects in its datastore, but recent cryptanalytic advances have rendered SHA-1 weak. There's ongoing work to transition to SHA-256, which is more secure. We'll cover the transition plan, where we are with it, what's involved in the transition work, and how we're going to provide interoperability between versions of Git using different hash algorithms.

Session

15:30 | Jan 31

Ten Git problems & how to fix them

Ever been stuck with Git? We may love Git for its distributed nature, powerful compression, and collaborative versioning. But, Git can lead us into sticky situations. In this workshop, explore 10 common Git problems and some ways to resolve them.

15:30 | Feb 1

Git & version control in the enterprise: a panel conversation with Atlassian, GitHub and GitLab

Session

12:20 | Feb 1

⚡️ - Native Git support for large objects

Large binary objects pose a special challenge for Git. This talk will explain how Git’s new partial clone feature and a new proposal to use content distribution networks can help.

Session

13:30 | Feb 1

Git for games: current problems and solutions

Git is *the* source control system of the modern era. Yet, the vast majority of AAA game studios still use Perforce, SVN, and other more traditional systems. It’s not for a lack of desire, rather, game developers have a unique set of constraints and workflows that make Git unsuitable for the task.

This talk will illustrate how game workflows are unique, why Git doesn’t currently support these workflows (even with LFS), and introduce a new tool, Git Global Graph, that strives to build a path for even the largest AAA developer to use Git. We’ll explore constraints on Game Development workflows and introduce the Git Global Graph project, a tool designed to solve the above challenges without compromising on the fundamental structures and benefits of Git.

Session

14:00 | Feb 1

The art of patience: why you should bother teaching Git to designers

While I was working as the only designer of the Yocto Project, the embedded Linux engineers in my office did something remarkable. They mustered the patience and the energy to teach Git to yours truly. They did it in stages: they started by how to clone a repository and how to check out its branches, taught me about remotes and how to create my own branches, how to commit my changes, and the etiquette of good commit messages. One glorious day, they decided I was ready to push to a remote repository. By golly I felt powerful. I had mastered Git's mysteries!

Becoming familiar with Git's basic concepts and commands took the best part of 2 years, but it was worth every minute. As a designer, learning Git made me more resilient, more independent and more useful to my development team. Learning Git made me a better designer.

In this talk, I will try to convince developers that they should invest time and effort in teaching Git to the designers they work with, what they have to gain from it, and how to go about it.

Session

14:30 | Feb 1

⚡️ - Version control for law: Posey Rule in the U.S. Congress

Many people talk of 'git for law'. It's neither as simple as coders imagine, nor as complex as lawyers would make it. A new rule in the U.S. House of Representatives (the 'Posey Rule'), requires redlined prints comparing documents before and after changes in Committee.

As a lawyer who codes, I work for the U.S. House of Representatives to build document comparison software that works for law, can track changes in law and ultimately will be able to show what the law was at any point in time.

Session

14:40 | Feb 1

⚡️ - Git, the annotated notepad

Ever forgotten what you were working on the night before and needed a few minutes to get back context? Wondering if you're writing the best code you could be? Having repetitive conversations with coworkers about your code?

We'll go over how git can help at every stage of coding, from fleshing out your idea to coming back to it over lunch, to the best highlighting you've missed putting to use.

Session

15:00 | Feb 1

Version control for visual learners

Can you remember the difference between two hex color values? Me neither! Entering visual representations of recently-changed elements into version control makes review of past changes easier & speeds acclimation to a new web project, especially for visual learners. Surprisingly, methods for including images in your version control aren’t standardized and are rarely used outside of large companies, and the rest of us are left checking out every major commit and viewing changes locally! Join me for a review of methods currently in use and discuss the benefits and drawbacks of each.

Session

16:30 | Feb 1

⚡️ - Gitbase, SQL interface to Git repositories

At source{d} we analyze a huge amount of git repositories and extract insights on source code. To do this we have created a powerful engine for language-agnostic analysis of your source code and git history. The git history part of the analysis is handled by Gitbase, an SQL database engine that is able to understand git repositories and is MySQL protocol compatible. You'll learn about our journey, from what began as a side project to the current state, its internals and the different solutions we approached.

Session

17:10 | Feb 1

How a Git based education cultivates more resilient developers

A coding education that not only incorporates Git into its education but forms its educational program around Git produces more resilient and more capable developers who can enter a business landscape and grapple with complex challenges. How does structuring an educational program around Git accomplish that? As a former technical coach at the Flatiron School I have helped numerous emerging programmers learn the fundamentals of software development and, more importantly, grapple with breaking a problem down into its smallest parts and have done so through using a "Git approach". This not only teaches good version control but cultivates a genuine trouble shooting mindset that can tackle multifaceted problems and issues, both in the code and in the logic underlying a program. Come and discover how Git is not only the premier version control software but is also a powerful educational tool.

Session

14:00 | Jan 31

Git Legit

If you're fighting with Git on a regular basis, you might not be using it optimally. In this workshop you're going to gain some hands-on experience that will make your day-to-day life as a Git user easier. You'll learn how to keep your history clean through atomic commits and interactive rebase options, how to easily pinpoint a certain time in your history using bisect, and more. Apply what you'll learn in these exercises to your daily Git process, and you'll never find yourself in merge hell again. Please note all attendees will need to download Docker in advance of the workshop.

Session

15:30 | Feb 1

Git & version control in the enterprise: a panel conversation with Atlassian, GitHub and GitLab

Session

16:40 | Feb 1

Technical contributions towards scaling for Windows

Session

Session info coming soon

Session

12:10 | Feb 1

⚡️ - Git protocols: still tinkering after all these years?

Git continues to evolve. This talk will examine recent changes to the Git protocol focusing on the introduction of protocol v2 to reduce communication overhead and increase extensibility. We will do a deep dive into the challenges of changing the way Git works, while maintaining all-important backwards compatibility.

Session

11:00 | Jan 31

Git hooks, aliases, and bears oh my

Tired of accidentally committing S3 keys, attempting to figure out which commit belongs to a pull-request, or if your commit messages are too mean? Discover the power of git aliases and hooks! Super-charge git by learning about the powerful alias and hooks system to create custom git commands and automate your workflow. This workshop will cover the basics of creating custom aliases to reduce confusion, as well as more advanced topics like utilizing sentiment analysis to make your commit messages great for everyone

Session

13:00 | Jan 31

Deep clean your Git repos (with LFS)

In this workshop we will have a quick look into the impact of a large file being tracked in git from the lens of git internals. Covering some Git LFS 101s we will then proceed to learn how to find large files and directories and fix some common commit attribution. The goal of the workshop is to provide a holistic understanding on how git internally handles large files and why this is a bad idea and how we could fix accidental commits of large files. We aim to cover all levels of git expertise with this workshop.

Session

15:30 | Feb 1

Git & version control in the enterprise: a panel conversation with Atlassian, GitHub and GitLab

Session

15:30 | Feb 1

Git & version control in the enterprise: a panel conversation with Atlassian, GitHub and GitLab