Become a partner New Blog Post A Beginner's Git Guide with Shopify - Part 3: Branching, Pull Requests, Merge Conflicts, and Workflow It's important to think about how to keep track of all the changes we make in our code, especially as projects become more complicated, when we collaborate with other developers, or when we just want to know what's been worked on or fixed in a project. This article is the third and final part in a series of articles about Git and Shopify. In this article you will learn: What Git branches are and how they work. How to create feature branches and sync them with GitHub. How to create a pull request on GitHub. How to resolve merge conflicts, and why they happen. Git workflows at Shopify, and for developers working with themes. More   More   Commerce Awards 2017 Celebrating Shopify Partners and developers everywhere Competition closes December 31   Apply now   Unsubscribe © Shopify Partners 150 Elgin Street, Ottawa ON, K2P 1L4