Git (and GitHub) have become pillars in how we manage our code workflow, particularly when we work with large teams. Yet developers tend to be afraid of Git, and only handle but the most basic of operations. This presentation will reveal the magic of Git, and help you understand how and why operations are carried out.
After this session, you'll never be afraid of a merge conflict again.
Topics covered:Common error scenarios and how to solve them * Tips and Tricks
Software Dev Manager @ PayPal, JavaScript Hacker. Currently leading the Merchant Activation team.