How to Use GIT with Shopify Themes

In this video, Tiffany will show you how to record and track changes you make when working with themes on Shopify. She’ll walk you through how to:
- install GIT on your computer
- initalize GIT on a Shopify theme project
- run basic commands
- use GIT for version control in your theme development workflow
More resources:
A Beginner's Git Guide with Shopify on our Partner Blog: bit.ly/2EK25OX
How to Set Up a Local Theme Development Workflow (Liam's video): bit.ly/3lCHrks
Understanding the GitHub flow: bit.ly/3gPUtY6
Git Flow for branching: bit.ly/2YSMnrE
Contents:
0:00 Introduction
1:44 What is version control?
5:33 Basic commands
12:06 Ignoring files
15:11 Reverting commits
18:09 Workflow and gotchas
--------------------------------
Subscribe to our channel for more videos about developing and designing ecommerce stores, apps, and themes with Shopify » / shopifydevs
Looking for more information about developing on Shopify check out www.developers.shopify.com and shopify.dev/
Connect with us on Twitter » shopifydevs
Launch your own online store by visiting Shopify and starting your free trial » bit.ly/VisitShopify

[@fabiomangolini]

The video is well done but in my opinion doesn’t face the tricky part of using git with shopify. I mean this is a beginner tutorial about git as many we can find out there, but what is difficult to understant is how create a complex development architecture between git, github (bitbucket etc) and shopify. Let’s make an example: I have 2 shopify store with a Prod theme and a Dev theme. The themes on the 2 store are same with small differences. In a case study like this, would be interesting to see how to set branches etc... and how to deploy from Dev to Prod

[@TiffanyTseDesign]

Agreed! This would be super helpful in a more advanced instance. I tried to go over a more simplified use case in this tutorial, but still give an idea of how to best use dev stores with a production store and what order to do specific commands in. Hopefully we can do a follow up that has more complex use cases.

[@ms1295]

@@TiffanyTseDesign Please create an updated follow up tutorial 🙏

[@jeffb6291]

Great content Tiffany
Thank you for sharing your knowledge 🙏
This channel is a great source of information for developers wanting to understand shopify better.
I am just starting with shopify development and learning how to make my first theme.
Many thanks for that 🙏🙏🙏✌️

[@FernandoComet]

Thanks a lot, very clear

[@ms1295]

Is this still up-to-date with Shopify CLI? Especially interested in the Workflow section. If a theme is tracked by Git, wouldn't it automatically be updated once the branch is merged?

[@jonathanschwartz4064]

Hi there. Thanks for this video! I believe the gotcha file to be cautious of is actually settings_data.json not settings_schema.json :) I can't believe I'm now a midnight TH-cam commenter acting like a know-it-all but hey, it's a weird year....

[@MC-nb2bh]

Great video! Informative! I was curious on how I can see my changes locally if I were working on my own branch.

[@modernobstacle]

Is the config.yml file something you would want to hide with gitignore bc it contains the api key and other stuff?

[@evaldasraisutis3058]

Thanks :)

[@KingdomCre8tive]

what are all the numbers is that a password? when entering git theme

[@LilianeWiemes-lb5qx]

Great content, we are doing this at the company I work for, but we encountered a problem when we create more than one branch for each feature developed, for example, we always create the branch from the master, sometimes the developer creates some features in a row for the same client , and it creates different branches, it can't wait until the validation of one branch to start the other one, so when it goes back to master and creates a new branch and goes to work on the theme it gets kind of outdated because the theme is up to date and the branch is not (because the old branch has not yet been validated and merged with the master), any solution for this?

[@ElTopDev]

What's the name of your company? I'd like to know companies who work with shopify related technologies

[@KingdomCre8tive]

you never explained where to get the site info to enter after git theme

[@rework7562]

Nice. But since Shopify 2.0 unfortunately this is outdated...

[@winnerwinnerbuymedinner9425]

im using shopify 3.0 now but hate git lol. unfortunately i have to use git. i havent heard anyone using git with 3.0 is it possible or no? does 3.0 already have all the capabilities built in. sorry i just graduated and im confused