Silicon Valley Code Camp : October 7 & 8, 2017

Lenny Markus

About Lenny
I'm a problem solver at heart. I've spent the last four years at PayPal working on a variety of interesting challenges, trying to find elegant solutions that make life easier for others, and teaching developers how to better use the tools available to them. Favorite Quote: "Perfect is the enemy of Done"
{speaker.firstName} {speaker.lastName}

Speaking Sessions

  • Everything you wanted to know about Git, but were afraid to ask.

    10:15 AM Sunday   Room: Town Square C

    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 Tricks