Git Merge 2018
Two days. All things Git.
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
-
Matt Desmond
Trainer, GitHub
-
Neha Batra
Manager, Engineering, GitHub
-
Katrina Uychaco
Software Engineer, GitHub
-
Johan Abildskov
Continuous Delivery Consultant, Praqma
-
Briana Swift
Trainer, GitHub
-
Brett Smith
Director of Strategic Initiatives, Software Freedom Conservancy
-
Diane Hosfelt
Research Engineer, Mozilla
-
Carlos Martin Nieto
Infrastructure Engineer, GitHub
-
Edward Thomson
Program Manager, Microsoft
-
Stephen Hathaway
User Experience Designer, Effective Inc.
-
William Chia
Sr. Product Manager, GitLab
-
Ashley Ellis Pierce
Application Engineer, GitHub
-
Andrey Devyatkin
Software Engineer, Self-Employed
-
Grant Mathews
Software Engineer, Atlassian
-
Pablo Santos Luaces
Chief Engineering Officer and Founder, Códice Software
-
Derrick Stolee
Senior Software Engineer, Microsoft
-
Johannes Schindelin
Senior Software Engineer, Microsoft
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, GitHub11:00
12:00
Lunch 🍔 🥗 🍕
1:00
2:00
Simulating Git workflows to show impact of strategies
Johan Abildskov, Praqma3:00
Scripting with Git
Briana Swift, GitHub9:00
Registration ✏️ & Breakfast 🍩
10:00
Opening Session
Brett Smith, Software Freedom Conservancy10:30
In Plain Sight: Securing code with an open source workflow
Diane Hosfelt, Mozilla11:00
Coffee Break ☕
11:10
Backing up large amounts of Git data
Carlos Martin Nieto, GitHub11:40
Security issues in Git
Edward Thomson, Microsoft12: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, GitLab2:00
Coffee Break ☕
2:10
Git driven refactoring
Ashley Ellis Pierce, GitHub2:40
Getting Git right
Andrey Devyatkin, Self-Employed3:10
Coffee Break ☕
3:30
Annotating diffs
Grant Mathews, Atlassian4:00
Automating the non-automatable; merging refactored code
Pablo Santos Luaces, Códice Software4:30
5:00
After Party
Experience
Getting to Git Merge
Travel tips for every leg of your trip.
Venue
Git Merge will be hosted in the Convent dels Àngels at MACBA, the historic chapel adjacent to the Museum of Contemporary Art in Barcelona.
Travel + transportation
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.
Hotels
You’ll find a variety of hotels and AirBnBs near the venue.
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.
When
March 8th 5pm - 8pm
WHERE
The MACBABeyond Git Merge
Join nearby events hosted by our GitMerge partners.
-
Beers with Bitbucket
Whether you've attended workshops, the contributor's summit, or arriving early for Git Merge, join the Bitbucket team for drinks and discussion about all things Git.
When
Wednesday, 7 March 2018 - 5:30PM-7:30PM
-
After, After Party with GitLab
Nothing left to do but drink some craft beer.
When
Thursday, 8 March 2018 - 8:00PM-11:00PM
FAQ
Registration
- 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.
Venue and accessibility
- 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.
Luggage and lost items
- 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.
Refunds and waitlists
- 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.
Sessions and content
- Will the event be recorded?
- Workshops on March 7 won’t be recorded, but recordings of all Conference Day sessions will be available.
Food and beverage
- 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.
After party
- 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.