Git Merge 2020 | March 4th | The Majestic Downtown, Los Angeles

Welcome / History & Future of Git

March 4 | 9:00am

Sno: Building on Git for Versioning Datasets

March 4 | 9:15am

Git and distributed version control systems have made advanced development workflows the norm, allowing independent developers, teams, and organizations to collaborate on software. At the same time, we are drowning in data, and for professional data wranglers in many industries, “auckland-mar2020-final-2-fixes-1-final.zip” is still the go-to for data versioning. In this talk, Robert Coup will discuss how Koordinates built an open source version control system on top of Git that's aimed at spacial databases (0-50GB) and their users. Attendees can expect to learn how to combine Git features to work with large repositories, how to use Git as the plumbing layer inside another tool, and more.

Speaker: Robert Coup

Koordinates

Robert Coup is the co-founder and head of technology at Koordinates, where his team powers open geospatial data distribution. He is a passionate open source developer and has spent far too many years manipulating all forms of geodata. Robert is a New Zealander now living in Scotland, where he spends his spare time sailing.

NoteDb: An adventure where Git is your database

March 4 | 9:45am

Git makes a great general-purpose database because it provides significant benefits in consistency, reliability, and audit logging. But it's probably nobody's first choice for a database, and turning it into one presents unique challenges. Hear why Patrick and his team decided to use Git as their database for the Gerrit Project (an open source code-review system) and the challenges they ran into along the way.

Speaker: Patrick Hiesel

Google

Partick is passionate about fast, scalable infrastructure. As an engineer at Google, he contributes to Gerrit Code Review, making code review for Google’s largest open-source projects faster and more delightful. He is serving as a maintainer in the Gerrit open-source project and a member of the engineering steering committee. When not at work, you can find Patrick skiing or hiking.

AGit flow (Alibaba centralized workflow and command line tool)

March 4 | 10:15am

Alibaba implemented a centralized Git workflow called AGit flow, which includes a series of patches on Git-core, a service-side filter (a new Git hook) and several server-side APIs, and a command line tool on client side. They plan to contribute the patches to Git, and open source the command line tool on GitHub in early 2020. The basic idea of the AGit flow is inspired by Gerrit, but with some differences. Hear more about AGit flow and how you can apply Alibaba's learnings to your workflow.

Speaker: Xin Jiang

Alibaba software

Jiang Xin lives in Beijing. He works at Alibaba China and is responsible for the architecture of their source code platform. He is also a Git contributor, l10n coordinator, and evangelist. In his spare time, he likes jogging around the Temple of Heaven, the background of his headshot that was created with Photoshop.

The Zen of Git

March 4 | 11:00am

Git is a version control system that's widely used and often misunderstood. Is it possible to really understand how it works, and maybe even enjoy using it? In this talk, it's Tianyu's goal to get you there. This session is for anyone who has used Git before and would like to learn more about how it works, so they can have a less fearful and more productive time using it in their day-to-day workflow. Using hand-drawn illustrations, Tianyu plans to talk about the internals of Git, including how objects are stored, and how things like branches and tags fit into this representation. Using her illustrations as a foundation, she'll dive further, making commonly used commands easier to understand and implement.

Speaker: Tianyu Pu

Booking.com

Tianyu Pu is a full-stack web developer with a strong passion for learning and teaching. Her background is in computer science and quantitative finance. Apart from Tianyu’s technical interests, you will find her geeking out about nutrition, physiology and physical training, and classical piano, among other things.

Scaling the Merge Machinery

March 4 | 11:30am

An overlooked dimension of scaling Git is dealing with large numbers of renames. Refactoring workflows can result in many renamed files—particularly when top-level directories are renamed—and this can pose a challenge for Git's on-the-fly rename detection. Palantir Technologies’s efforts to optimize rename detection uncovered multiple different strategies to tackle the problem, and also turned up a few opportunities to optimize the merge machinery for cases without any renames. In this talk, Elijah Newren will provide a high-level overview of the merge machinery and how it is used, the ideas and insights being leveraged to optimize these codepaths, and some early results from the optimization work.

Speaker: Elijah Newren

Palantir Technologies

Elijah Newren currently works at Palantir Technologies where they let him pick his own title for business cards, and he couldn't come up with anything more creative than "Software Engineer". He was, once upon a time, heavily involved in the Gnome open source desktop community, is the creator of Git-filter-repo, and works on various aspects of Git, including the merge machinery. He is a proud member of the league of non-adventurous eaters, and he and his wife have eight children ranging in age from almost one to senior in high school.

Git at Scale for Everyone

March 4 | 12:00pm

Repositories never get smaller. As your team grows, your repositories grow even faster. Git is growing, too. Luckily, the community is improving Git's performance to tackle the many dimensions of scale. Microsoft supports the largest Git repositories—Windows and Office—so Derrick Stolee’s team has a unique perspective on Git at scale. In his talk, he’ll share strategies that keep Git fast, including how to design your engineering system to take advantage of tools like sparse-checkout, fsmonitor, and partial clone. When combined with a "microservices in a monorepo" design, your team will feel like they are working with a small repository while contributing to a large project. Derrick will also share his tools to help Git manage large repositories, so your team can stop waiting on Git and can get back to what you do best.

Speaker: Derrick Stolee

Microsoft

Derrick Stolee is a Git contributor, focusing on performance features such as the commit-graph and multi-pack-index. The Git Ecosystem Team at Microsoft specializes in the client experience for the largest Git repositories ever, and brings that experience to the rest of the community.

Virtualization for Monorepos

March 4 | 1:30pm

At ESR Labs AG, Christian Schilling and his team have implemented a novel approach to the monorepo strategy. Their tool acts as a proxy between a Git server and its clients, and is capable of transforming history on demand, enabling users to pull from and push to smaller virtual repositories. This helps to ease the transition to a monorepo from other existing setups. Christian's presentation explains the motivation behind the development of Josh and shows how his team uses the tool to solve many problems common in growing organizations and repositories.

Speaker: Christian Schilling

ESR Labs AG

Christian is a Senior Software Engineer at ESR Labs, where he develops embedded software that already runs in millions of cars. He is also a major driving force in scaling the company’s version control infrastructure to account for increased complexity and shortened cycles of embedded software development.

Stump the Experts

March 4 | 2:45pm

Git is quickly becoming industry standard in the software field. Jamin Ewell's session will cover why Berkshire Hathaway's software developers transitioned from TFS to Git for version control within visual studio. The overview will include challenges presented by TFS to her team and how Git solved those problems. You'll also walk away with insight about the Git workflow within Berkshire Hathaway as a whole.

Workshop 1

March 4 | 4:00pm

Workshop 2

March 4 | 5:00pm