Git Merge 2022 | Sep 14 - 15, 2022 | Chicago, IL

Session

2:30pm | September 15

An Improved Workflow for Submodules

An overview of and update on Google's efforts to create an improved workflow with submodules, as announced on the mailing list in 2021.

Session

4:00pm | September 15

Git at GitHub Scale

This talk will cover how and why GitHub uses Git to host and serve millions of repositories. We'll cover GitHub's fork of Git, our development model and merging strategy. We'll also cover what new features GitHub has used from the upstream community (like commit-graphs, partial clones, etc.) as well as features that GitHub has developed (like MIDX bitmaps, and cruft packs). We'll discuss each of these features in detail, covering their impact on GitHub, as well as the open-source project. We'll also discuss future directions, including more bitmap enhancements, the use of merge-ort at GitHub, and more.

Session

1:00pm | September 15

Improving git status performance in Uber's Go monorepo

As the size of Uber's Go monorepo grows, Git commands are getting slower and slower. We address the issue from two fronts:

• Sparse checkout: we developed a tool that allow users to specify a list of directories that they need to change, the tool calls bazel query to discover all files in the repository needed to build projects in the given directories and checks out the directories and their dependencies. The tool maintains a private work tree to run Bazel queries and a work tree for each sparse checkout.
• FS Monitor: we can share some git performance data without any fsmonitor, with Watchman, with daemon, on macOS vs on Linux for those who are not using sparse checkout

Session

1:00pm | September 15

Improving git status performance in Uber's Go monorepo

As the size of Uber's Go monorepo grows, Git commands are getting slower and slower. We address the issue from two fronts:

• Sparse checkout: we developed a tool that allow users to specify a list of directories that they need to change, the tool calls bazel query to discover all files in the repository needed to build projects in the given directories and checks out the directories and their dependencies. The tool maintains a private work tree to run Bazel queries and a work tree for each sparse checkout.
• FS Monitor: we can share some git performance data without any fsmonitor, with Watchman, with daemon, on macOS vs on Linux for those who are not using sparse checkout

Session

5:30pm | September 15

Git Internals: a Database Perspective

The inner workings of Git's object database can be a mystery to most users. When you incorporate a database into your infrastructure, you are expected to learn about database internals such as table indexes, query plans, and sharding. Similar features exist in Git, and learning about them can advance your use of Git to the next level.

Session

Session info coming soon

Session

5:00pm | September 15

The 2 tools you need to trim down 1 humongous repository

Part of Azure DevOps migrations often involves swapping out the underpinning source control. Build up history for over 20 years, including all kinds of binary file formats, make up a gigantic repository that is a pain to work with. I've had great success using filter-repo (and BFG before), git lfs, and a bit of excel to split, cleanup, reduce, remove and replace GBs of history into only a few 100 MBs tops. In this session, I will show my plan of approach. For everyone that likes to have clean and concise repositories.

Session

1:15pm | September 15

Build-aware sparse checkouts

Twitter has developed a tool called focus which manages sparse checkouts as defined by targets in Bazel. By carefully defining the dependency model, we can precompute dependency queries such that users can create the sparse checkout without necessarily having to invoke Bazel first in a dense checkout.

Session

11:45am | September 15

Git driven debugging

Developers often debate using print statements or the debugger to trace bugs within their code. But what if I were to tell you that you can use Git? In this lightning talk, we'll explore using Git to quickly identify and resolve bugs and regressions.

Session

10:30am | September 15

Learn How Git's Code Works

This talk discusses the concepts and implementation of Git's very first revision (i.e. Git's initial commit), as published by Linus Torvalds in 2005. The talk explores the actual C code that Linus wrote in 2005 when he developed the initial commit of Git's codebase. Topics covered would be Git's original implementation of file compression, hash functions, Git objects (blobs, trees, commits), the current directory cache (staging area), the structure of Git's original C codebase (which amazingly is only 10 files and ~1000 lines of code), and a demo of Git's original set of commands.

Session

Session info coming soon

Session

1:30pm | September 15

500,000 files and counting - Git tooling for monorepos at Canva

At Canva, we made the conscious decision to adopt the monorepo pattern with its benefits and drawbacks. Every week, hundreds of engineers work across half a million files generating close to a million lines of change (including generated files), tens of thousands of commits, and merging thousands of pull requests. We have developed some techniques and tooling to help us deliver Git at scale including a caching proxy for CI use and local git execution tracing via OpenTelemetry.

Session

3:00pm | September 15

(Git Merge)²

Discussing improvements in "Git Merge" at "Git Merge", hence (Git Merge)². This talk will discuss recent improvements in the merging machinery, which actually extends to several commands besides "merge". It will include:

• What new features have been enabled by the new merge backend
• How a couple of the new optimizations involve trade-offs, and what the possible behavioral differences might mean for you
• A brief story of my discovery process for finding the new optimizations added to the merge (and diff) machinery

Session

10:45am | September 15

Git to empower your instinctive skills and your collaboration culture

Although nowadays we need to use git to manage the version control in our code projects, we forget git is more than a tool to upload and share our code. During my journey as a developer I've seen how software projects evolve and grow in many ways: more code, more features, more people, more business rules, more complexity than any software project. I´d like to share my experience as a joiner in new projects who have to deal with this complexity for the beginning.

If you only use git to commit your changes and allow it to integrate, you´re probably losing the opportunity to take advantage of all the things that you can do with git. When I used to teach git to young developers I say git is more than six commands, because it's about how you and your team are building software. So using git you´re able to discover all the collaborative dynamics in your current project.

During this talk I’ll share how you can use git as the magnifier to learn not just about code, to learn about how your team is collaborating together, how to reconstruct parts of your project, understand how your team is building features, how git could gives you the answer to many questions for your team, I’ll share how it’s a powerful tool for new joiners, and how git could become you to a better team player.

Session

11:15am | September 15

Git: a Love Story

A git story is more than just your typical story. It is one that often centers around a hero. But we typically only see the end pull request: the story that the hero wants us to see. Before the rebase, the story is filled with struggles and stashes. Filled with time travel, love, and hate. All the elements that make for an epic tale. And today, we take a step back to marvel at the journey, not just the end result. As it is through the fire, our git skilled are sharpened.

Session

1:45pm | September 15

How Git Can Power an Exciting Future for Content Management

Git-based CMSs address the perceived technical barrier of using Git by providing simple interfaces to Git functionality for non-technical editors. In this session, we'll explore a new wave of content management systems that are built on top of Git.

Session

2:00pm | September 15

How Git is transforming the future of hardware development

Many hardware teams are starting to leverage the power of git by piecing together disparate tools, but they’re still stuck in the past, especially when compared to software development. This session will cover the best practices hardware engineers have shared with us for adapting git workflows in hardware development.