Git Merge 2018

Two days. All things Git.

Watch Videos

March 07: Workshop Day

March 08: Conference Day

About

About Git Merge

Git Merge is a one-day conference (with an add-on Workshop Day) dedicated to the version control tool that started it all—and the people who use it every day. From technical sessions to hands-on workshops, developers of all experience levels will find new ways to use, build on, and scale Git on their teams.

Speakers

Speakers

  • Matt Desmond headshot

    Matt Desmond

    Trainer, GitHub

    Matt is a technical documentation nerd turned trainer with experience in laboratory information systems, IT security certifications, payment authentication platforms, and GitHub. He loves helping people work smarter.

    Session

    10:00 | Day 1

    Minimizing keystrokes - A look at Git aliases

  • Neha Batra headshot

    Neha Batra

    Manager, Engineering, GitHub

    Neha Batra is the GitHub Desktop Engineering Manager who, many years ago, was an energy consultant and quit to teach herself programming because “it was time.” She holds a bachelor’s in Mechanical Engineering from MIT and enjoys foodie adventures, meticulously documenting her trip itineraries, snapchatting, and pronouncing GIFs how it should be: jiffs. If you want to hear her ramble on a topic, ask her about how agile xp fits into the “real world” or her newfound love for static typing.

    Session

    11:00 | Day 1

    Demystifying Git

  • Katrina Uychaco headshot

    Katrina Uychaco

    Software Engineer, GitHub

    Katrina is a software engineer at GitHub, where she works on Atom, GitHub’s free and open source text editor. Formerly a medical device engineer, Katrina found her passion in building software — specifically building awesome software to better facilitate building more awesome software. She’s a lover of elegant abstractions, all things meta, and tools and tricks that improve the development process. When Katrina’s not using Atom to hack on Atom, she’s often working to empower other engineers through teaching, mentoring, or organizing events for Bay Area women in tech.

    Session

    11:00 | Day 1

    Demystifying Git

  • Johan Abildskov headshot

    Johan Abildskov

    Continuous Delivery Consultant, Praqma

    Johan Abildskov is a Continuous Delivery consultant with Praqma. He helps companies get better at automation, continuous delivery and most importantly Git. Johan is an experienced Git teacher and takes pride in the success of others.

    Session

    2:00 | Day 1

    Simulating Git workflows to show impact of strategies

  • Briana Swift headshot

    Briana Swift

    Trainer, GitHub

    With a background in creative arts and software development curriculum, Briana collaborates with teams and individuals working with the visionary tools available through Git and GitHub. Through a positive and energetic approach, she helps others achieve their own exciting new ventures through the use of these innovative technologies.

    Session

    3:00 | Day 1

    Scripting with Git

  • Brett Smith headshot

    Brett Smith

    Director of Strategic Initiatives, Software Freedom Conservancy

    Brett Smith is the Director of Strategic Initiatives at Software Freedom Conservancy, working to build the organization’s technical infrastructure. Over the years he’s held a variety of advocacy and technical roles in free software, working at the World Wide Web Consortium (W3C) and the Free Software Foundation.

    Session

    10:00 | Day 2

    Opening Session

  • Diane Hosfelt headshot

    Diane Hosfelt

    Research Engineer, Mozilla

    Diane Hosfelt is an engineer at Mozilla Research working on the Servo project. She studied at Johns Hopkins University, where she completed a Master's thesis on applications of machine learning to cryptography. After a brief stint working for the US Department of Defense, she joined the Servo team to explore applications and advancements available when using Rust for cryptography related projects.

    Session

    10:30 | Day 2

    In Plain Sight: Securing code with an open source workflow

  • Carlos Martin Nieto headshot

    Carlos Martin Nieto

    Infrastructure Engineer, GitHub

    Carlos has been working with or on Git for the past eight years. He is currently in the Git Infrastructure team at GitHub helping keep the Git data safe and available.

    Session

    11:10 | Day 2

    Backing up large amounts of Git data

  • Edward Thomson headshot

    Edward Thomson

    Program Manager, Microsoft

    Edward Thomson is a Program Manager for Microsoft Visual Studio Team Services, where he helps ensure that people are successful using Git in VSTS. Prior to becoming a Program Manager, he was a Software Engineer building version control tools at GitHub, Microsoft, and SourceGear. He's a co-maintainer of the libgit2 project and the host of All Things Git, the podcast about Git.

    Session

    11:40 | Day 2

    Security issues in Git

  • Stephen Hathaway headshot

    Stephen Hathaway

    User Experience Designer, Effective Inc.

    Stephen Hathaway is an experience designer at Effective Inc. in Denver, CO where he brings 4+ years of experience to his current role. He strives to build unified user experiences across a variety of mediums by infusing design with core development principles. When he's not delighting users, you can find him on his bike, playing in Colorado's mountains, or holing up in coffee shops to read or write code.

    Session

    1:00 | Day 2

    Designers Git-It; A unified design system workflow

  • William Chia headshot

    William Chia

    Sr. Product Manager, GitLab

    William is a technical marketer at GitLab who’s been crafting both code and copy since the late 90’s. Prior to joining GitLab, William worked in product marketing at Twilio and Digium. Outside of work, you can find William cooking, skateboarding, and playing video games with his wife and three children.

    Session

    1:30 | Day 2

    Empowering non-developers to use Git

  • Ashley Ellis Pierce headshot

    Ashley Ellis Pierce

    Application Engineer, GitHub

    Ashley lives in Durham, NC and is an Application Engineer at GitHub. She enjoys helping others learn to code and is the lead organizer for RailsBridge Triangle and a mentor for Code the Dream, an organization that helps minority and immigrant youth break into tech. Her favorite programming languages are Ruby and Elixir. In her free time she enjoys cycling, amateur furniture building, and photography.

    Session

    2:10 | Day 2

    Git driven refactoring

  • Andrey Devyatkin headshot

    Andrey Devyatkin

    Software Engineer, Self-Employed

    Andrey is a long time Continuous Delivery enthusiast and public speaker passionate about software development processes automation.During the years, Andrey has worked as a software developer, build and release engineer, SRE, architect for Continuous Integration and Delivery infrastructure. Currently, Andrey is providing consulting services worldwide and building a company for likeminded location independent automation professionals.

    Session

    2:40 | Day 2

    Getting Git right

  • Grant Mathews headshot

    Grant Mathews

    Software Engineer, Atlassian

    Grant is a software engineer for Atlassian Bitbucket in San Francisco, California. He's previously worked on problems ranging from analyzing engineered tissue viability to filtering spam in video games, and currently alternates between breaking and fixing infrastructure used by millions of customers

    Session

    3:30 | Day 2

    Annotating diffs

  • Pablo Santos Luaces headshot

    Pablo Santos Luaces

    Chief Engineering Officer and Founder, Códice Software

    Pablo has been in version control for the last 13 years, creating products like Plastic SCM, code-aware merge tools and then the gmaster Git client. He holds a master's degree in Computer Science from University of Valladolid. When not coding he loves to ride sportbikes.

    Session

    4:00 | Day 2

    Automating the non-automatable; merging refactored code

  • Derrick Stolee headshot

    Derrick Stolee

    Senior Software Engineer, Microsoft

    Derrick Stolee is a Senior Software Engineer at Microsoft. He previously worked the Git server for Visual Studio Team Services and now applies that knowledge to speed up the Git client, especially for very large repositories.

    Session

    4:30 | Day 2

    Making Git for Windows

  • Johannes Schindelin headshot

    Johannes Schindelin

    Senior Software Engineer, Microsoft

    Johannes Schindelin maintains Git for Windows. He used to be a number theorist, a geneticist and a scientific image processing expert. He now works at Microsoft, spending most of his time trying to improve Git for Windows’ user experience.

    Session

    4:30 | Day 2

    Making Git for Windows

Schedule

Schedule

Join us the day before the conference for hands-on workshops hosted by some of the best trainers in the world covering a range of Git topics . Just add on a Workshop Day Ticket to your Conference Ticket at checkout to lock in your spot—space is limited.

9:00

Registration ✏️ & Breakfast 🍩

10:00

Minimizing keystrokes - A look at Git aliases

Matt Desmond, GitHub

12:00

Lunch 🍔 🥗 🍕

2:00

Simulating Git workflows to show impact of strategies

Johan Abildskov, Praqma

3:00

Scripting with Git

Briana Swift, GitHub

9:00

Registration ✏️ & Breakfast 🍩

10:30

In Plain Sight: Securing code with an open source workflow

Diane Hosfelt, Mozilla

11:00

Coffee Break ☕

11:10

Backing up large amounts of Git data

Carlos Martin Nieto, GitHub

11:40

Security issues in Git

Edward Thomson, Microsoft

12:10

Lunch 🍔 🥗 🍕

1:00

Designers Git-It; A unified design system workflow

Stephen Hathaway, Effective Inc.

1:30

Empowering non-developers to use Git

William Chia, GitLab

2:00

Coffee Break ☕

2:10

Git driven refactoring

Ashley Ellis Pierce, GitHub

2:40

3:10

Coffee Break ☕

3:30

Annotating diffs

Grant Mathews, Atlassian

4:00

Automating the non-automatable; merging refactored code

Pablo Santos Luaces, Códice Software

5:00

After Party

Experience

Experience

01

Getting to Git Merge

Travel tips for every leg of your trip.

Git Merge will be hosted in the Convent dels Àngels at MACBA, the historic chapel adjacent to the Museum of Contemporary Art in Barcelona.

We recommend flying into Barcelona—El Prat International Airport (BCN).

The Convent dels Àngels is accessible via the Barcelona Metro. You can take the red or green lines to the Catalunya station and walk a few short blocks to the venue.

You’ll find a variety of hotels and AirBnBs near the venue.

02

Git Merge After Party

We’ll be closing out the conference with our annual Git Merge After Party. Unwind from the day, meet more attendees, and enjoy a cocktail in the historic Convent dels Àngels.

March 8th 5pm - 8pm

The MACBA
03

Beyond Git Merge

Join nearby events hosted by our GitMerge partners.

FAQ

FAQ

Can I get a receipt for my ticket?
Yes, send us a note at events@github.com.
Can I attend workshops if I didn’t purchase a Workshop Day ticket when I bought my Conference Ticket?
We may be able to add you to a workshop if space is available. Send us a note at events@github.com.
Do I need to print my ticket and bring it to the conference?
No, you can print your ticket or open your ticket on your phone when you check in. There’s also an EventBrite app that makes mobile check-in easier.
Will the conference have wifi?
Yes.
Are you providing captioning or language translation?
Send us a note at events@github.com if you need these services—we’ll make sure you’re set up with everything you need to enjoy the event.
Will there be a nursing room on site?
Yes, we’ve arranged a private room for nursing, and we can provide refrigeration upon request.
Will there be gender neutral bathrooms on site?
Yes.
What should I do if I don’t want my photograph taken?
Please inform our Registration Team, and they’ll give you a red lanyard.
Will there be a place for me to store things?
Yes, we’ll have a coat check area. You’re welcome to drop off luggage, but please don’t leave valuables.
Where do I go if I lose something?
If the event is in progress, stop by the Help Desk to check if someone dropped off your lost item. After the event, send us a note with a description of the item at events@github.com.
Can I get a refund for my ticket?
Yes, you can get a refund for Git Merge 2018 through March 1st. After that day we will no longer be offering refunds.
I am on the waitlist for workshops. When will I be informed if I am given a spot?
Yes, we’ll email you before the Workshop Day if a spot opens up. Please note: We will not be admitting people to Workshop Day if they aren’t registered on the day of the event.
Will the event be recorded?
Workshops on March 7 won’t be recorded, but recordings of all Conference Day sessions will be available.
Do you provide breakfast and lunch?
Yes, we’ll provide complimentary breakfast and lunch on both days.
What time are meals served?
You can see meal times in our event schedule. Please leave enough time to pick up your badge and grab a bite to eat before start time.
We provide vegetarian, vegan, dairy-free, and gluten-free options. If you have additional dietary needs, please let us know at least 48 hours in advance, and we’ll do our best to provide an option that works for you.
Where and when is the Git Merge After Party?
The After Party will be at the MACBA directly after the conference from 5 pm - 8 pm
Do I need my badge for entry?
Yes, all attendees will need to keep their badge for the After Party.
Will non-alcoholic beverages be available?
Yes.
Can people who aren’t attending the conference join?
At this time we are unable to accommodate people who are not registered for Git Merge 2018.
Venue Quesitons
Help Desk