Skip to content

Learn from the experts: RSVP for workshops at Git Merge

451a1e06-7de6-4ebe-a30d-95008b2e1efd

At Git Merge—a conference for the Git community—you'll join developers who are committed to the future of Git. In addition to seeing an amazing lineup of speakers, attendees of all levels are invited to participate in a series of workshops led by the best Git trainers in the world. You won’t want to miss this unique opportunity to brush up on your skills while learning from the experts.

Workshops are 60-90 minutes and will take place concurrently with the general sessions. Take a moment to RSVP here to reserve a seat. Please note that you must also be registered for the main conference in order to attend any workshops.

Get out of (almost) anything with Git
One of the big advantages of version control is knowing you have a safety net in case anything goes awry. In this workshop, we'll explore common predicaments and discuss how to use the best tool for the job to get out of different tight spots. While the material we'll cover can help the beginner and the seasoned professional alike, attendees should have a basic working knowledge of Git and be comfortable on the command line.

Making the switch to Git LFS
If you're starting a new project, using Git LFS is easy. Converting an existing project, however, can present a few challenges. In this workshop, we'll adapt a sample project to use with Git LFS, Git's filter-branch command, and the BFG Repo-Cleaner. We'll also talk about the implications these approaches have on your project and your collaborators. Attendees should have a general understanding of Git internals and be comfortable working on the command line.

Mastering git-imerge
Git-imerge reduces the pain of merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch. It also lets you interrupt, save, and publish in-progress merges—so you can test partially-merged code, or even collaboratively fix conflicts. In addition, it offers a straightforward method for preserving history while rebasing. This workshop will teach you how to use git-imerge to do all of this. It is intended for reasonably experienced users though it requires no expertise in Git.

Scripting Git
This workshop will cover several ways to write Git scripts. We will start by using the command-line client and Git's plumbing commands in shell scripts. Then we'll demonstrate how to write Git scripts in scripting languages, by using libgit2 and the various bindings to it (the workshop examples will focus on Ruby and Rugged). Attendees should understand the basics of Git internals.

Check out the full conference schedule here. Git Merge is happening on April 5, 2016 in New York City. We hope to see you there!

Open Source Alley at OSCON: Call For Projects

OSCON is headed to Austin this year and we're bringing back the GitHub Open Source Alley. The alley features open source projects from across the community where they can chat with attendees, share their work, and get new contributors involved. OSCON runs from May 17 - 19th, 2016, in Austin and we'd like to invite you to apply to be a part of Open Source Alley.

GitHub Open Source Alley

As a featured project at one of the most popular open source conferences in the world, you'll get:

  • Table in Open Source Alley adjacent to GitHub's booth
  • Two complimentary OSCON passes for contributors and maintainers
  • Dedicated presentation time in the GitHub booth to highlight your project, deep dive into the code, and get people involved.

To be considered, you just need to complete the application by Friday, April 1st, 2016. The application form has the complete details and requirements for participating.

Can't wait to see you in Austin!

CodeConf LA tickets are now on sale

CodeConf LA June 27-29

CodeConf LA will converge June 27-29, 2016 in sunny Los Angeles for three days of unforgettable discussions.

This year’s event will focus on systems engineering projects, practices, and programs in the open source community. We'll explore topics ranging from systems programming practices to operating applications at scale over three days and 30+ sessions, lightning talks, and workshops.

Tickets

Early Bird tickets are now on sale for $299. Grab yours before April 9th, when prices will go up by $100. While you're at it, consider purchasing a scholarship ticket, which will be granted to someone from an underrepresented community who would not be unable to attend otherwise.

Sessions

June 27: A full day of workshops and training
June 28-29: 30+ Featured sessions, lightning talks and speaker Q&A

We believe that competing and complementary opinions lead to valuable insights. Over the course of the conference, there will be back-to-back talks exploring different subjects from contrasting perspectives, followed by a chance to participate in the conversation with other attendees.

If you have a subject for a session in mind or would like to give a talk, please submit a proposal. We'll be finalizing the agenda over the next few months, so follow along on codeconf.com and Twitter for updates.

Hotel

If you're coming from out of town, stay nearby at the W Hollywood.

CodeConf is accessible from both LAX and BUR airports, and is just around the corner from the Hollywood/Vine LA Metro stop.

You won’t want to miss this educational and inspirational event, dedicated to the open source community. Hope to see you there!

Speakers Announced for Git Merge 2016

451a1e06-7de6-4ebe-a30d-95008b2e1efd

We are excited to announce our confirmed speakers for Git Merge 2016! On April 5th, 2016 at New York City's New World Stages (350 West 50th Street, New York City) we'll converge around a system that has become an integral part of all of our development workflows. This year’s Git Merge speakers will explore everything from scaling Git to Git optimizations. In addition to four training workshops by some of the best Git trainers in the world, you won’t want to miss these sessions:

Greg Kroah-Hartman, a Fellow at the Linux Foundation, will present on Linux kernel development. Hear his advice on how to stay sane while keeping up with development (hint: it’s Git). Greg is the author of two books about Linux kernel development, both free online, and has written many papers and articles about the Linux kernel.

Ryan Hodson is a marketer, writer, and web developer at CloudFlare and has consulted for technology companies including Atlassian and Syncfusion. Ryan's session on Git for Static Websites will explore the benefits of “going static” for everything from simple Jekyll blogs hosted on GitHub Pages to prime-time commercial marketing websites.

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. Her session on Teaching Git at last year’s conference was a huge hit, and we’re excited to welcome her back again in 2016.

Patrick Reynolds is a Git core contributor and a member of the GitHub systems team. If you’re curious about how we scale Git at GitHub, you won’t want to miss this session.

In addition to these exciting sessions, join us to hear talks by Spencer Krum (IBM), Tim Pettersen (Atlassian), Lars Schneider (Autodesk), Charles Bailey (Bloomberg), Sytse Sijbrandij (GitLab). John Haley & Hamid Shojaee (Axosoft) and Emily Xie (Wayfair).

We have plans for additional sessions, workshops, and an Afterparty at SpinNYC, so stay tuned as we roll out more information on git-merge.com and Twitter in the coming weeks. If you haven’t already, grab yourself a ticket before they sell out. We look forward to seeing you there!

Save the Dates: GitHub Events in 2016

Mark your calendars. GitHub has a fresh lineup of events for 2016 – including two new European conferences, GitHub Satellite and CodeConf Copenhagen.

universe

Git Merge: April 5, New York City

Git Merge is the pre-eminent Git conference: a full-day event featuring technical content and training workshops for Git users of all levels. Git Merge is dedicated to amplifying new voices from the Git community and to showcasing the most thought-provoking projects from contributors, maintainers, and community managers around the world. Tickets are now on sale. Interested in speaking at Git Merge? Send us an overview of your talk by February 5th. We’d love to hear from you.

GitHub Satellite: May 11, Amsterdam

The first ever European conference in the GitHub Universe event series, GitHub Satellite is a celebration of the latest and greatest in software. Join us to learn how developers, founders, and activists work to create impactful technologies. Great software is about more than code; at Satellite, we'll showcase how the community is tackling the newest and most difficult challenges posed by the modern development workflow.

CodeConf Los Angeles: June 27-29

This year CodeConf, a two-day conference for the open souce community, moves to the West Coast. At CodeConf we will get together to discuss best practices in open source, documentation, community-building, and innovative technical hacks. Check out the lineup from last year's event in Nashville to get a taste of what you can expect.

GitHub Universe: September 14-15, San Francisco.

GitHub Universe is returning to Pier 70 for a two-day conference celebrating technologists and developers from across the GitHub community. Last year, we heard from people who are improving people's lives using technology and redefining how software is built. This year, you can look forward to an even better Universe.

CodeConf Copenhagen: October 24-25

CodeConf comes to Copenhagen for a conversation with the European open source community. Thought-provoking sessions and networking opportunities are just a few of the reasons we hope you’ll join us.

For updates on all of these events as they emerge, keep your eye on https://twitter.com/github.

GitHub Universe: Mission Report

unknown-1 1

Last week we launched GitHub Universe, a two-day conference where developers from all over the world convened at Pier 70 to discuss how to build, collaborate on, and deploy great software.

As we gathered in front of the main stage, the octocat appeared in full, living color in an animated short created especially for Universe by the GitHub creative team

To open Universe with a bang, our CEO and co-founder Chris Wanstrath made several announcements about new developments that will make the GitHub experience better than ever.

chrisuniversecircuitboard

Partnership with Yubico:

To help users better secure their accounts, GitHub's authentication system now supports FIDO Universal 2nd Factor (U2F)—a rapidly growing open authentication standard. Yubico's U2F compliant keys are ready to protect GitHub’s millions of users and their volumes of sensitive data. Thousands of GitHub users redeemed a discount to purchase a new key. The 20% discount on YubiKeys is still available to any GitHub user while supplies last.

Integrations Directory:

It's now easier than ever to use your favorite tools with GitHub. Check out these powerful integrations, including Travis-CI and Slack, and build better software, together.

Git Large File Storage (LFS):

Git LFS replaces large files such as audio samples, videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server like GitHub.com or GitHub Enterprise. Check it out.

unknown-5

The general sessions from Universe are available to view on UStream. All of the talks from the Build, Collaborate and Deploy breakouts will be available to view soon, so keep your eye on Twitter.

GitHub Universe would not have been possible without the support of our 13 excellent sponsors, who provided delicious food and coffee and beautiful art installations for our enjoyment.

unknown-4 1

GitHub is how people build software. We will continue our voyage next year, so stay tuned for updates.

Explore GitHub Universe

universe-header

Are you at Pier 70 today for GitHub Universe? Want to earn some sweet patches to iron onto your newly acquired tote bag, and enter to win some prizes (generously provided by Twilio) while you're at it?

Complete the steps below before 3pm on Friday to earn merit badges. Each merit badge can be retrieved and ironed on to your tote at the iron-on station near the entrance upon proof of task completion.

To earn the Build badge: Introduce yourself to a stranger and tweet a photo of yourselves using #exploreuniverse.

To earn the Collaborate Badge: Head to the obliteration room – get someone to take a picture of you contributing a sticker to the chaos and share via twitter using #exploreuniverse.

To earn the Deploy badge: Tweet @twilio using #exploreuniverse: If you had unlimited time and resources to build anything with Twilio and GitHub, what would it be?

If you complete these steps, you're entered to win an iPad Mini 4, a Sphero and an Amazon gift card. Winners will be announced at 3:30pm on Day 2 of the conference on Twitter, so make sure to follow @githubuniverse.

We hope you'll join us in exploring!

Learn From the Experts at GitHub Universe

educationalspeaker_blogheader

Interested in polishing your GitHub skills this week? Many GitHub Universe speakers will be offering tips, tricks, and case studies on everything from pull requests to workflow strategy. Don’t miss these educational and entertaining sessions:

  • GitHub's Brent Beer explores what makes a great pull request and how GitHub’s features unlock a strong workflow.
  • GitHub’s Matt Colyer teaches GitHub Enterprise basics, from administration to maximizing new features.
  • Look at a range of strategies for knowledge sharing, support, and practice with Peter Bell at Wheelhouse.io.
  • Hear from Ben Balter and the GitHub Pages team about advanced techniques that can help improve your content publishing workflow.
  • Maximize your GitHub Enterprise security system with tips about installation and collaboration from GitHub’s Matt Duff.
  • Mozilla’s Myk Melez discusses how to integrate Offline Web Apps with GitHub Pages to host static assets.

Check out the full schedule of sessions here. See you tomorrow!

GitHub Universe: Prepare for Launch

With the first ever GitHub Universe only a few short days away, we wanted to give you an overview of some of the cool stuff we have planned that you might have missed, and to make sure you’re prepared.

universe-header

Transportation

  • There will be no parking at Pier 70, so if you drive you will need to find parking in the Dogpatch nearby.
  • If you choose to take Public transit, take the Muni T-line and exit at 3rd St & 20th St. Follow signs to the entrance.
  • Bike valet will be available for cyclists as you approach the venue.
  • Have your Uber driver enter the code UNIVERSE2015 in the “destination” field on your Uber app to take you directly to the front entrance of Pier 70 (420 22nd Street). New users of Uber will get $20 off transportation with this code!

The Main Event

  • Pier 70 is a raw, industrial space. We recommend wearing closed toed shoes and bringing layers, as it might be cool in the morning and evening. It’s part of the adventure.
  • To make GitHub Universe as accessible as possible, we will be providing ASL interpretation and a nursing room on site. If you are interested in ASL interpretation for a specific session, please email socialimpact@github.com and we will insure that interpretation services are available to you.
  • Universe attendees will have the opportunity to sign up for a complimentary, 30 minute consultation conducted by our very own GitHub Services team, to discuss workflows, use cases, migrations, or any other Git topics you had in mind. If you're interested in joining us, please send an email to services@github.com. Since we have a limited number of sessions, attendees will be scheduled on a first-come, first-served basis.
  • We have updated the Code of Conduct. Please review it here.
  • Check out Gitter's Unofficial Hitchhiker's Guide to GitHub Universe, an app designed to help you connect with other Universe attendees! Meet likeminded people and form a dinner group.

After-party

  • The after-party will take place on Thursday, October 1 at the Village (969 Market Street), beginning at 8pm and continuing until Midnight. Mike Relm and a special guest headliner will provide musical entertainment, while CODAME Art + Tech will treat us to some trippy interactive installations. Know someone who can't attend the conference but wants to join you at the afterparty? We are opening up a few tickets to the public for this event; you can grab those here.

Follow @githubuniverse for updates and live video during the show, and use the hashtag #githubuniverse to share photos and thoughts from the conference floor.

If you haven't got your ticket yet, you'd better get it quickly. We're almost sold out!

We can’t wait to see you there :rocket:

Embracing Open Source: GitHub Universe Speakers Tell Their Stories

featured speaker blog header

If you’re inspired by collaborative software design, be sure to check out these GitHub Universe sessions, which will explore how open source continues to change the way developers build great software.

Building Communities Around Open Source Security Software

For the past year, Facebook has been building community trust and fostering empathy through the use of an open source security tool. Christine Abernathy and Teddy Reed will be sharing their experiences around osquery and their open source communities.

Christine Abernathy is a Developer Advocate on the Open Source team at Facebook, with previous Developer Advocacy roles with Parse and Facebook Platform. Teddy Reed is a Security Engineer at Facebook developing production security tools. He is passionate about open source and collaborative engineering when scale, resiliency, and performance enable defensive and protective software design.

Open Source Principles for Internal Engineering Teams

The open source process has proven adept at producing high quality software that can be built, maintained, and adapted at scale. Join Brandon Keepers, GitHub’s Open Source Evangelist, as he examines how “inner-sourcing”—adopting open source philosophies and workflows—can improve internal engineering teams.

An engineer by trade, Brandon Keepers believes open source is a fundamental to building great products, and great products sustain healthy open source projects.

The Importance of Positive Feedback

In the tech community, positive and constructive feedback is the foundation upon which we build a safe environment to learn, teach, and improve code skills. One Medical Group’s Enrique Mogollan explores why these environments have made the Ruby community attractive for many people.

Enrique Mogollan's experience as software engineer ranges from backend and web applications to integrations and open source projects. He believes that collaborative environments are the key to promote quality code and improve software design.

Check out the full schedule of sessions here. We hope to see you next week!

Thanks to our GitHub Universe Sponsors

We wanted to involve sponsoring companies in memorable ways at or our inaugural GitHub Universe conference. On October 1-2, you can expect to enjoy art installations, delicious coffee and juice, comfortable lounges and entertainment contributed by these organizations. Check them out!

sponsorlogos

The official conference after-party at the Village, featuring interactive installations by CODAME, music by Mike Relm and surprise guests, is brought to you by Huawei.

Lounges are sponsored by Heroku, Microsoft, and AWS. Make sure to thank them when you’re kicking back and enjoying some quiet time on a comfy couch.

Our installation sponsors, Travis-CI, Waffle.io, Target, GitKraken, and Digital Ocean will integrate visual art into your GitHub Universe experience. Look for their logos in eye-catching designs around Pier 70. As our scavenger hunt sponsor, Twilio will engage you in an interactive search for clues that unlock one-of-a-kind prizes.

Compose.io will keep you caffeinated with delicious Ritual coffee. Stack Overflow will provide a gorgeous custom-branded notebook so you can jot down all the pearls of wisdom delivered to you by our great roster of speakers.

Appnovation and Cisco are also supporting Universe as community sponsors.

Interested in grabbing a last minute sponsorship? Take a look at the prospectus and shoot us an email to discuss how we can partner with you to make GitHub Universe even better.

You still have a chance to grab a ticket! Get yours now before we sell out.

Complete Schedule for GitHub Universe

You've been asking for it, and we're ready to share the complete GitHub Universe schedule. Each day will start off at 8:30AM with registration and breakfast. You'll want to be in your seat by 10AM for the opening keynotes from GitHub:

  • Chris Wanstrath, Co-founder and CEO
  • Nicole Sanchez, VP of Social Impact

Then you can hear from some of the industry's best thinkers in our featured sessions:

  • Dr. Yvonne Pendleton, Director of SSERVI, NASA
  • Kellan Elliot-McCrea, former CTO, Etsy
  • Dr. Michael B. Johnson, Pre-production Software Architect, Pixar
  • Anil Dash, Co-founder, Makerba.se
  • Tiffani Ashley Bell, Co-founder & Executive Director, Detroit Water Project
  • Marianna Tessel, SVP of Engineering, Docker
  • Marco Annunziata, Chief Economist, GE

Packed into both days are 24 breakouts featuring people from across the tech community. Whether you want to learn best practices on collaboration directly from GitHub or hear how some of the best companies are building great software, Universe will keep you busy. Here are a handful of sessions you can look forward to:

  • Democratic Deploys at Airbnb from Igor Serebryany, who will discuss Airbnb's process for shipping code efficiently and safely
  • Building Communities Around Open Source Security Software from Christine Abernathy and Teddy Reed at Facebook.
  • Pull requests, code review, and the GitHub flow from GitHub's own Brent Beer
  • Metrics-driven Development from Spotify engineer and Python Foundation Board member, Lynn Root
  • Keep your code secure with GitHub Security Best Practices from GitHub Services Engineer, Matt Duff

That's a sample of the full schedule. Also hear from speakers from Autodesk, GE, Target, Bloomberg, and Mozilla. Developer tool fans won't want to miss Josh Kalderimis, CEO of Travis CI, or James Smith, CEO of Bugsnag. You can even learn how to build desktop apps using web technologies with Electron.

And, of course, you are invited to an afterparty on Thursday, October 1st, with three floors of music, food, beverages, and plenty of space for socializing.

We have a couple other tricks up our sleeves that you'll just have to come to Universe to see. We hope you'll join us on October 1st and 2nd for our first conference to celebrate the GitHub community. If you need help getting to Universe, don't forget about our scholarship program.

Tickets are still available, we'll see you in a couple weeks.

GitHub Universe: Diversity Partners and Scholarship Program

universe_header

As VP of GitHub's Social Impact team, I am thrilled to share some news about our upcoming conference.

Conferences like GitHub Universe represent an opportunity for people from all over the tech community to come together to explore the challenges faced by software developers worldwide. When a wide range of points of view are represented, the value of the conversation increases.

However, the average cost of a conference ticket can create a barrier to entry for some, and the Social Impact team believes it is critical to break down those barriers for groups that have been excluded from tech and the open source community.

We couldn’t be prouder to have partnered with the following organizations to distribute GitHub Universe tickets:

We’ve also instituted a scholarship program to make tickets available on an individual basis to those who might otherwise have difficulty attending the conference. If you’d like to apply for a scholarship ticket, please send an email to socialimpact@github.com, detailing how you will benefit from going to GitHub Universe.

Want to help out? Head over to the registration page and buy a scholarship ticket that will then be donated to a worthy applicant.

I hope to see you in the audience at my GitHub Universe session! Don't forget, if you want to book a hotel room at the discounted rate, today is the last day to do it, so grab your ticket and your room now.

First look at GitHub Universe speakers

GitHub Universe will feature over 30 speakers from a wide range of industries. These technical leaders will share how their teams collaborate and build great software. We've got a preview of some of the amazing speakers that will be joining us on October 1st and 2nd in San Francisco. You can find the complete list of announced speakers at githubuniverse.com.

universe-speakers

Keynotes and featured speakers

We'll start each day at Universe with keynotes from GitHub and featured speakers from world renowned software organizations. From making movies to discovering objects in space, you'll hear how these teams collaborate:

  • Chris Wanstrath, Co-founder and CEO, GitHub
  • Dr. Yvonne Pendleton, Director of SSERVI, NASA
  • Dr. Michael B. Johnson, Pre-production Software Architect, Pixar
  • Nicole Sanchez, VP of Social Impact, GitHub

Speakers from the whole community

Not only will both days be packed with sessions from GitHub, but you'll also get to see the full spectrum of the GitHub community. Open source teams, enterprise customers, and partners are all coming together to share their experiences.

  • Hima Mukkamala, Executive Director of Software Engineering, GE Software
  • Josh Kalderimis, Co-founder and CEO, Travis CI
  • Bill Walker, Senior Manager, Mozilla
  • Christine Abernathy, Open Source Developer Advocate, Facebook
  • Dan Cundiff, Lead Software Consultant, Target

And that's just the start. Stay tuned to githubuniverse.com and @githubuniverse for the complete list of speakers and full scheduling coming soon.

If you haven't grabbed a ticket to Universe, it's not too late. Get your ticket before they sell out.

GitHub Universe: The Big Bang

universe-twitter-header2

GitHub Universe is bringing the GitHub community together on October 1st & 2nd at Pier 70 in San Francisco. Universe is two full days on how to build, collaborate, and deploy great software presented by GitHub.

Tickets

The first batch of tickets is now on sale for $399! Grab yours before this limited release is gone, and prices increase by $200 on September 1st. While you're at it, you can purchase a scholarship ticket, which will then be granted to someone from an underrepresented community who would be unable to attend otherwise.

Sessions

Universe will take place over two days, packed with content:

  • 2 Keynotes, including GitHub Co-founder & CEO, Chris Wanstrath
  • 6 Featured sessions from industry leaders
  • 24 Breakout sessions from customers, partners, and members of the GitHub community

In addition to sessions from GitHub engineers and trainers about Enterprise, security and the GitHub flow, you'll hear from organizations like NASA, Mozilla, Target, and Travis CI on technical deep-dives, best practices, case studies, and more.

Hotel

If you're coming from out of town, book a discounted room at the W San Francisco while they last. Quantity is limited and the discount period ends September 11th.

Great software is about more than just code. GitHub Universe is a celebration comprised of two full days of sessions, activities, and collaboration with the most vibrant software community. Part festival, part conference, GitHub Universe is not to be missed. Will you be there?

Something went wrong with that request. Please try again.