GitHub / Git Merge 2017

Caren Garcia is an Implementation Engineer at BazaarVoice, and an organizer of the Austin chapter of Women Who Code. In this talk, she'll showcase how Git can be used for the classroom, for writers and professionals that can benefit from using Git for their work.

About GitMerge
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 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. Find out more at git-merge.com

In this session, Matt Duff will write the remedial functionalities of Git in Ruby, giving us a greater understanding of the simplicity that underpins Git.

About GitMerge
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 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. Find out more at git-merge.com

This session, hosted by Patrick McKenna of GitHub, features some of the "greatest hits" from discussions in an internal-to-GitHub Slack channel (called #git-users) over the last year. The tricks & tips cover everything from plumbing commands and workflow advice, to thoughts on designing new Git tooling.

About GitMerge
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 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. Find out more at git-merge.com

Kyle Macey instructs us how to clean up our out of control
repositories with filter-branch and BFG, and then moves on to tips for using git-lfs for a healthier tomorrow.

About GitMerge
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 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. Find out more at git-merge.com

Johan Abildskov & Jan Krag, from Praqma, teach us to channel the git force and improve workflows using customized configurations, attributes and hooks.

About GitMerge
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 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. Find out more at git-merge.com

Submodules or Subtrees? Both are proposed by Hector Alfaro and Kyle Macey as solutions for handling dependencies with Git. In this session the gloves are coming off, which one will win it all?

About GitMerge
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 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. Find out more at git-merge.com

Hector Alfaro, trainer at GitHub, searched the world over for the gnarliest, most terrifying git scenarios he could find. In this session, he'll teach us how to use some of the more advanced porcelain commands to detangle all the things and become a git hero or heroine.

About GitMerge
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 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. Find out more at git-merge.com

Thordur Bjornsson, a software developer at Yubico, has over a decade of experience hacking on databases, protocols, storage, and open source operating systems. His 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. He'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.

About GitMerge
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 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. Find out more at git-merge.com

Cornelius Schumacher works for SUSE Linux as a senior software developer and engineering manager, and has been an open source contributor for more than a decade.

Though git doesn't support pair programming natively, there are workarounds and best practices around how to do productive pair programming with git. This presentation will give an overview of how this works, with practical insights from one of the biggest open source projects using pair programming as its primary means of development. It will include a sketch and discussion about how git could get native support for pair programming.

About GitMerge
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 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. Find out more at git-merge.com

Check out 3 quick lightning talks from Tamir Gefen, Meredith L. Patterson, and Santiago M. Mola.

Tamir Gefen presents a case study on moving to Git from IBM Rational ClearCase, including challenges; how to resolve them; some technical tips and lessons learned (including insights).

Meredith L. Patterson discusses the use of Git as a blockchain-like primitive for the delivery of humanitarian aid in a stored-value network. She'll also talk about git as a primitive for delay-tolerant design, and what that implies for P2P technologies and the developing world.

Santiago Mola discusses the development of go-git, a Git library written entirely in Go. He'll introduce the library and share some use cases.

About GitMerge
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 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. Find out more at git-merge.com

Tim Pettersen is a Bitbucket developer by day, and Git evangelist by night.

In the first section of his talk, he'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 he'll move on to the fun part: a bestiary of aliases. Tim has scoured dark corners of the web, freenode, and social media to uncover mystic aliases that perform every function from automating standup meetings to "I'm feeling lucky" searches across the DAG. He breaks apart each alias in turn, and dissects their guts to understand how they do what they do.

About GitMerge
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 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. Find out more at git-merge.com

Lars Schneider & Taylor Blau, of AutoDesk and GitHub respectively, discuss recent performance improvements to Git LFS.

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.

About GitMerge
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 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. Find out more at git-merge.com

Durham Goode is the tech lead on the Source Control team at Facebook. Facebook uses Mercurial to host some of the largest, fastest growing distributed version control repositories in the world. Over the past four years, they've dealt with numerous scaling challenges, ranging from the number of commits per minute to creating robust, redundant server infrastructure. Facebook has 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, Durham will talk about the specific technical and user experience improvements Facebook has open sourced to handle their growing scale, with an emphasis on the lessons learned that could be valuable to Git and the Git community.

About GitMerge
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 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. Find out more at git-merge.com

Santiago Perez De Rosso is a PhD student in the Software Design Group at MIT. In this talk, he will 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.

About GitMerge
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 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. Find out more at git-merge.com

Saeed Noursalehi, Principal Program Manager, Visual Studio Team Services, discusses in depth how Microsoft is using git internally, with a specific focus on large repositories.

He’ll describe the architecture of VSTS’s git server, which is built on Azure, and the customizations Microsoft has had to make to both it and git.exe in order to enable git to scale further and further.

About GitMerge
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 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. Find out more at git-merge.com

In this talk, Carlos Martin Nieto, will describe the 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.

About GitMerge
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 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. Find out more at git-merge.com

Hear from Karen Sandler, Executive Director, about the work of the Software Freedom Conservancy, and the role of governance in the open source ecosystem.

About GitMerge
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 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. Find out more at git-merge.com