14 Mar 2019
Presented by Brian M. Carlson, Git Ecosystem Engineer, GitHub
"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."
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
"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."
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
- 1 participant
- 21 minutes
14 Mar 2019
Presented by Javier Fontan, Senior Software Developer, source[d]
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.
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
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.
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
- 1 participant
- 10 minutes
14 Mar 2019
Presented by Ivan Frade, Minh Thai, Software Engineers, Google
"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 over 1000 distinct repositories, and Chromium, a monorepo with more than 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 greater than 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."
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
"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 over 1000 distinct repositories, and Chromium, a monorepo with more than 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 greater than 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."
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
- 2 participants
- 24 minutes
14 Mar 2019
Presented by Johan Abildskov, Trainer & Consultant, Praqma
"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."
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
"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."
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
- 1 participant
- 25 minutes
13 Mar 2019
Presented by John Austin, Founder / Technical Lead, A Stranger Gravity, Funomena
"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."
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
"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."
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
- 1 participant
- 25 minutes
13 Mar 2019
Presented by Brandon Williams, Software Engineer, Facebook
"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."
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
"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."
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
- 1 participant
- 10 minutes
13 Mar 2019
Presented by Terry Parker, Engineering, Google
"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."
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
"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."
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
- 1 participant
- 12 minutes
13 Mar 2019
Presented by Ari Hershowitz, Director of Open Government, Xcential Corporation
"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."
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
"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."
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
- 1 participant
- 9 minutes
12 Mar 2019
A panel conversation with Atlassian, GitHub and GitLab, featuring:
- Erik van Zijst, Principal Engineer, Atlassian
- James Ramsay, Product Manager, GitLab
- Briana Swift,Trainer, GitHub
Facilitated by CB Bailey, Developer, Bloomberg
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
- Erik van Zijst, Principal Engineer, Atlassian
- James Ramsay, Product Manager, GitLab
- Briana Swift,Trainer, GitHub
Facilitated by CB Bailey, Developer, Bloomberg
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
- 4 participants
- 32 minutes
12 Mar 2019
Presented by Aniket Subhash Kadam, Consultant, Self Employed
"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."
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
"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."
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
- 1 participant
- 9 minutes
12 Mar 2019
Presented by Belén Barros Pena, Interaction Designer, Open Source Design
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.
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
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.
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
- 2 participants
- 26 minutes
12 Mar 2019
Presented by Veronica Hanus, Software Engineer
"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."
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
"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."
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
- 1 participant
- 28 minutes
11 Mar 2019
Presented by Ben Greenberg, Developer Advocate, Nexmo
"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."
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
"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."
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
- 1 participant
- 24 minutes
11 Mar 2019
Presented by John Briggs, Engineering Manager, Microsoft
John is the engineering manager for the Git ecosystem team in Azure DevOps. His team is tasked with helping Git scale to support some of the largest repositories in the world with contributions to core Git, Git for Windows, and VFS for Git. Previously, John worked on the version control web experiences for Azure Repos and facial animation middleware for the games industry.
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
John is the engineering manager for the Git ecosystem team in Azure DevOps. His team is tasked with helping Git scale to support some of the largest repositories in the world with contributions to core Git, Git for Windows, and VFS for Git. Previously, John worked on the version control web experiences for Azure Repos and facial animation middleware for the games industry.
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
- 1 participant
- 28 minutes
11 Mar 2019
Presented by Deb Nicholson, Director of Community Operations, Software Freedom Conservancy
"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!"
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
"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!"
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
- 1 participant
- 24 minutes
