Edward talks to Patricia Aas, a veteran C++ developer, about how read a brand new codebase, understand it, and how to get started contributing to it.

Patricia Aas is a programmer who has worked mostly in C++ and Java. She has spent her career continuously delivering from the same code-base to a large user base, from working on two browsers (Opera and Vivaldi), to working on embedded telepresence endpoints for Cisco. She is focused on the maintainability and flexibility of software architecture, and how to extend it to provide cutting edge user experiences. Her focus on the end users has led her work more and more toward privacy and security, and she has recently started her own company, TurtleSec, hoping to contribute positively to the infosec and C++ communities. She is also involved in the #include<C++> organization hoping to improve diversity and inclusion in the C++ community.

Show Notes

• Patricia Aas
  • Twitter: @pati_gallardo
  • LinkedIn
• TurtleSec
• #include<C++>
  • Deconstructing Privilege
  • Survival Tips For Women In Tech
• NDC London

Edward talks to Keith Dahlby, the creator and maintainer of posh-git, about tech conferences, what it's like to be a Microsoft MVP, and PowerShell versus unix shells.

Keith Dahlby is a father, a web developer, a git enthusiast, a language geek, and a nine-time C# MVP from Cedar Rapids, IA. By day, he accelerates world-changing ideas from Iowa with NewBoCo, and he teaches at DeltaV code school. By night, he is a promiscuous open-source contributor. He previously architected the e-commerce platform at J&P Cycles. His open source efforts include posh-git, a git environment for PowerShell, Griddle, a grid component for React, and up-for-grabs.net, a site featuring open source projects looking to mentor new contributors. He was also a core contributor to LibGit2Sharp.

Show Notes

• Keith Dahlby
• posh-git
• That Conference
  • Cori Drew and Katelyn Drew
• Removing use of English expletives in libgit2

Edward talks to Bradley Kuhn and Karen Sandler, the co-founders of the Software Freedom Conservancy, a non-profit that supports free and open source software projects, including git.

Bradley Kuhn is a distinguished technologist at the Software Freedom Conservancy and he's worked on free software non-profits for many years, including co-founding the Conservancy with Karen. Karen Sandler is the Executive Director of the Software Freedom Conservancy, and she's most well-known for trying to find the source code for her pacemaker defibrillator.

Show Notes

• Bradley Kuhn
• Karen Sandler, and on Twitter: @o0karen0o
• Software Freedom Conservancy, a not-for-profit charity that helps promote, improve, develop, and defend Free, Libre, and Open Source Software (FLOSS) projects, including git.

• Outreachy, a project by the Software Freedom Conservancy that provides three-month internships for people from groups traditionally underrepresented in tech.

• Git / Software Freedom Conservancy Status Report (2018)
• Git's Trademark Status and Policy
• libgit2 is joining the Software Freedom Conservancy

It's easy to become a supporter of the Software Freedom Conservancy and help support that they do with git and other free and open source software projects.

We're supporters - are you?

Edward is joined by Anders Borum, the developer behind Working Copy, a Git client for iOS.

Anders Borum is a independent app developer from Copenhagen. He has been making iPhone and iPad apps since 2009 struggling to make a living through his own apps instead of consulting work. Since 2014 he has been working on a Git client for iOS.

Show Notes

• Working Copy, a Git client for iOS
• Working Copy in the App Store
• @workingcopyapp on Twitter

Edward and Martin keep talking about branching and merging, including how some of the other code integration commands work - including rebase, cherry-pick, and revert. Part two of two.

This is the conclusion to Part 1.

Show Notes

• Git Branching: What a Branch Is from the Pro Git book
• Inside Git, an explanation from TechDays NL 2017

Edward and Martin get caught up after the security release earlier this month and talk branching and merging, including how Git actually stores branches and does merging.

They got so excited about talking about branching that this is actually part one of two.

Microsoft and GitHub

Martin and Edward didn't discuss the announcement, since Edward can't talk intelligently about the subject yet. Every time the topic comes up, he just looks like this:

Since Edward can't be settled down to have a discussion, here's some news on the announcement:

• Microsoft Announces that it will Acquire GitHub
• A Bright Future for GitHub
• Hello, GitHub
• I'm Nat Friedman, Future CEO of GitHub. AMA.

Show Notes

• Git Branching: What a Branch Is from the Pro Git book
• Inside Git, an explanation from TechDays NL 2017

Edward and Martin discuss the recent security vulnerability in Git - CVE 2018-11235. They talk to Etienne Stalmans, the security researcher who discovered it, and discuss what happens in the Git security community after a vulnerability is reported.

Etienne is a Platform Security Engineer & Researcher in the Public Cloud Security Group at Salesforce. He has a keen interest in protocol reversing and finding ways to abuse functionality in everyday products.

Show Notes

• Etienne Stalmans
• Twitter: @_staaldraad
• Git's announcement for CVE 2018-11235
• An explanation of the May 2018 Git Security Vulnerability
• How to tell if you're patched

Edward and Martin talk with their old boss Eric Sink about the history of version control as he's seen it - and helped create it. Eric founded SourceGear, a company that created several version control products, and literally wrote the book on version control, Version Control by Example.

In his own words:

Eric's work in version control tools includes SourceGear Vault, which was quite popular in the early days of .NET, and Veracity, which was one of the open source DVCS tools that got crushed by Git. SourceGear today has pivoted to become a 12-step recovery program for people addicted to writing version control tools.

Show Notes

• Eric Sink
• SourceGear, the company behind SourceOffSite, Vault and SourceGear DiffMerge.
• Vault, the Movie, the trailer that announced SourceGear Vault.
• "Microsoft is becoming cool again", wherein Eric explains how it's his doing that Microsoft open-sourced .NET.

Edward and Martin talk with Joe Nash about using Git in education, self-diagnosed OCD around capitalization, and using pull requests in non-development workflows.

Joe is the student program manager at GitHub, where his work aims to help student leaders build inclusive learning communities. When not capitalising the H in GitHub, Joe can usually be found talking about the educational benefits of hackathons, or rolling d20s.

Show Notes

• Joe Nash
• Joe helps explain Git and GitHub
• Edward obeys his competitor's brand guidance
• Uncanny Valley
• Chrome extensions for GitHub
  • Octotree
  • Refined GitHub
• PiNet, a system for Raspberry Pi classrooms
• David Newbury on Git concepts:

  Git reminds me of some academic concepts. You can teach it, but It only really makes sense if you know the history of what came before and have worked at a level of complexity where you NEED it. Once you get there it changes your worldview but explaining why that’s so is SO hard.
  David Newbury (@workergnome)

Edward and Martin talk about the fundamentals that you need in your Git repository like a proper .gitignore to keep your repository clean, conditional configuration, and setting line endings with your .gitattributes file.

Show Notes

• Getting Started with .gitignore
• .gitignore collection, a crowd-sourced collection of 1 .gitignore files for different types of projects.
• Git for Windows: Line Endings
• Git Conditional Includes to perform conditional configuration.

Edward talks with James Montemagno about getting started using Git, being one of the top 5 C# developers on GitHub (with 3000 followers!), centralized version control systems before Git and building CI/CD pipelines around Git.

James Montemagno is a Principal Program Manager for Mobile Developer Tools at Microsoft. He has been a .NET developer since 2005, working in a wide range of industries including game development, printer software, and web services. Prior to becoming a Principal Program Manager, James was a professional mobile developer and has now been crafting apps since 2011 with Xamarin. In his spare time, he is most likely cycling around Seattle or guzzling gallons of coffee at a local coffee shop. He can be found on Twitter @JamesMontemagno, blogs code regularly on his personal blog http://www.montemagno.com, and co-hosts the weekly development podcast Merge Conflict.

Show Notes

• James Montemagno
  • Twitter: @JamesMontemagno
  • GitHub: @JamesMontemagno
• Merge Conflict
• Xamarin Live
• The DevOps Lab: Real World Mobile DevOps with VSTS and App Center