**NOTE: This slide deck contains many animations. You should download and view in PowerPoint if y...
**NOTE: This slide deck contains many animations. You should download and view in PowerPoint if you can! ***
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