Lenny Markus
Dev Manager, PayPal
Software Dev Manager @ PayPal, JavaScript Hacker. Currently leading the Merchant Activation team.
Silicon Valley Code Camp : October 3rd and 4th 2015Session
Everything you wanted to know about Git, but were afraid to ask.
Go beyond `pull` and `push`. Git has become a crucial tool in our day to day workflow. Understand how it works, and learn how to wield it properly. After this session, you'll never be afraid of a merge conflict again.
About This Session
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: * Git under the hood * Git basics * Merging vs Rebasing * Conflict resolution * Triangular Workflow * Common error scenarios and how to solve them * Tips and TricksThe Speaker(s)