GitHub / Git Merge 2016

Learn about a number of neat tricks used on the command line to make git experiences more straightforward. Most of these tricks compose the standard unix utilities. Only one or two require any packages outside of the standard set. At least one of these tricks will wow you so much that you’ll add it to your .bashrc on the spot. Discover the patterns used construct these small utilities and you will start creating and using your own.

Spencer Krum (http://spencerkrum.com) has been sysoping Linux since 2010. He works for IBM contributing upstream to OpenStack and Puppet. Spencer is a core contributor to the OpenStack Infrastructure Project.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

Git is hard to grasp. This is especially true if you've worked for decades with centralized version control systems such as Perforce, CVS or SVN. This talk is about our journey to on-board 4000+ engineers with 200+ different code bases to Git at Autodesk. Amongst other things, Lars will cover how we manage the Git client setup at that scale as well as AutoDesk's experiences with large Git repositories.

Lars Schneier is the technical lead for Git at Autodesk, working out of Berlin, Germany. His current work involves migrating large codebases to Git and establishing Git workflows within teams. He is a Git contributor, the author of the ShowInGitHub Xcode plugin, and is an avid kiteboarder.

For over a decade Emma Jane Hogbin Westby has been teaching people how to use version control systems. Most people she's encountered still find Git hard to learn on their own. In this session you will learn why most approaches to teaching Git fail to appropriately address the adult learner, and what you can do to make the on-boarding experience easier for others. She will touch on adult education best practices, and also share the secrets that make it easier for very large (and corporate) teams to transition to Git.

Emma Jane Hogbin Westby is a member of the field information services development team at United Nations Office for the Coordination of Humanitarian Affairs (UN-OCHA) and the author of the O'Reilly titles Git for Teams and Collaborating with Git.

In this talk, Emily will explore and use Git’s plumbing commands to dissect what is going on behind the scenes at a low level when we use Git. Along the way, we’ll solidify our conceptual understanding of Git, exploring questions such as: How does Git store our information? What is at the heart of a branch? What is actually happening when you do a Git checkout? Or a reset?

Emily Xie is a software engineer on the Devtools team at Wayfair. Outside of work, she teaches women how to code and helps organize the Boston branch of Girl Develop It. Emily currently lives in Cambridge, MA, and enjoys photography, cooking, yoga, and razing villages in Age of Empires II.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

Git was designed with the command line in mind, but does that hold the application back? John Haley, Product Owner of Axosoft GitKraken and Hamid Shojaee, Founder of Axosoft, argue that the CLI can be complicated and confusing, with a steep learning curve even for developers. That’s why they’ve created a Git client that is not only beautiful and easy-to-use, but actually translates Git concepts into visually understandable processes.

Hamid Shojaee is addicted to the high of making great software. He is founder of two tech companies, Axosoft and Pure Chat, and has been a leader in the Arizona tech community for over 20 years.

John Haley has been writing software for over 25 years and is currently Product Owner of Axosoft GitKraken. John loves bridging the two worlds of art and science in order to create software that, like a good piece of art, leaves the user feeling an emotional connection to it.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

Microsoft is in the middle of moving the majority of its own product development onto Git. Yes, that Microsoft. From small codebase to large. Over 15k developers are already using Git today, with 10’s of thousands yet to come. The journey to get there has been an interesting one, full of ups and downs. Saeed will discuss Microsoft's journey and the challenges along the way, both social and technical.

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.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

Streamlining your static website development workflow is easy with Git. Learn the benefits of “going static” for everything from simple Jekyll blogs hosted on GitHub Pages to prime-time commercial marketing websites. We’ll survey the static website landscape, including Jekyll, Gulp, and automated deployment with Git and Heroku. We’ll also explore practical use cases like automatically purging your CDN’s cache with GitHub hooks and containerizing your static site with a backend API.

Ryan Hodson is a marketer, writer, and web developer at CloudFlare. He's written extensively about Git on both his own website, RyPress.com, and as a consultant for technology companies including Atlassian and Syncfusion. Ryan is also a Mac app developer and author of comprehensive Objective-C, Cocoa development, and MathML tutorials.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

The Linux kernel is the largest collaborative software development project ever. This talk will discuss exactly how Linux is developed, how fast it is happening, and how we all try to stay sane keeping up with it (hint, git is the reason).

Greg Kroah-Hartman is a Fellow at the Linux Foundation. He is currently responsible for the stable Linux kernel releases, and is a maintainer of the USB, TTY, and driver core subsystems in the kernel as well as other portions of the codebase that he wishes he could forget about. He is the author of two books about Linux kernel development, both free online, and has written many papers and articles about the Linux kernel.

In this talk, Charles will cover analyzing objects within the git repo, rewriting history, and tools & techniques for migrating your team to a healthier repository.

He'll show how to use a new option to 'git cat-file' to analyse what is taking up the space in your repository and how effective Git's delta compression is in your repository. Charles will also demonstrate one way to rewrite history, and talk about the merits of a number of the other options, including migrating to a solution such as git-lfs. He'll also cover techniques and tools for letting all team members easily migrate their work in progress to the new history.

Charles Bailey is a programmer and Git advocate. He is at home in C++, Bourne shell, Perl, Sinclair BASIC, Python, C, and various assembly languages. He works for Bloomberg in Developer Experience, helping teams implement optimal practices and workflows.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

The GitHub Systems team provides Git as a fast and reliable service, both as the backend for GitHub.com the website, and directly to users. To do that, we first make Git itself fast and reliable. But we also must consider Git as a distributed application, at the scale of billions of operations per day. Hear about the challenges that presents, and learn about the bespoke tools GitHub has built to monitor, shape, cache, and replicate transactions in our Git service.

Note: In this talk, Patrick refers to DGit, which was an internal codename for the project to distribute the storage of git repositories more efficiently within GitHub's infrastructure. In order to reduce redundancy and potential confusion, GitHub has subsequently renamed the project Spokes.

Patrick Reynolds leads the team at GitHub that runs Git as a service. He has been building tools to monitor and troubleshoot distributed applications for more than ten years: first as an academic research project, then as a product at BlueStripe Software, and most recently for internal use at GitHub.

Public recipes are the original open source, and for hundreds of years cooks have not only shared their source but also built incredible schools in their kitchens. Cooks of all levels face the constant pressure of staying relevant, and just like the best engineers, they do this by doggedly practicing the basics while experimenting on the bleeding edge. In this talk, we’ll learn to stay relevant by looking at the surprising parallels between modern kitchens and effective engineering teams.

Juan Pablo Buritica is the VP of Engineering at ride.com where he leads a distributed team throughout the US and Latin America that is working to reinvent how people commute to work and take 1 million cars of the road. Juan Pablo has built effective software engineering organizations by emphasizing Open Source software values, technical excellence, trust and empathy. He has organized five software engineering conferences, spoken at multiple events, and led the growth of Colombia’s JavaScript community, the largest Spanish-speaking JS community in the world with more than 3,000 members.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

Developers love Git for its raw speed, powerful history traversal, distributed nature, and the fact that it was built by uber developer Linus Torvalds. What we don't love is the fact that, out of the box, Git has somewhat lacking support for tracking large binary files!

Fortunately, developers from GitHub, Atlassian, and Visual Studio Online have teamed up to work on an open source (MIT licensed) project to solve this problem: Git LFS (Large File Support).

In this session, Tim will cover the computer science behind Git LFS' internals & architecture, CLI usage and how to build an effective Git LFS workflow for a development team.

Tim has been an Atlassian developer for almost a decade spanning the JIRA, Bitbucket Server and Cloud, FishEye, and Crucible teams. He tweets (as @kannonboy), speaks and blogs about developer workflows, Java, JavaScript, Atlassian's developer tools and all manner of Git arcana.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

Now is the time to bring the collaborative DVCS workflow to your deployments. This talk walks you through the essential steps of making the collaborative DVCS workflow a reality at your company, and then discusses the strategies GitLab utilizes to make the most of this process.

Sid saw the first ruby code in 2007 and loved it, so he learned to program and made this his profession. Previously, he engaged in various businesses, from selling programmable infrared receivers to starting a recreational submarine company. He is always looking to publicly document answers and make processes more efficient.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/