Great videos. I was a little confused by the last requirement at 1:36. My understanding is that by using Shopify's Github integration, I can no longer use the auto update feature in Shopify, even though I originally added the theme via the Shopify Theme store (I use Dawn). This is because I downloaded the theme files and then uploaded them back into Shopify via Github. I now get the message "Updates are not supported for uploaded themes."
@6:02 you say to copy over all files except certain ones or else we lose customizations, but @5:22 we've created this branch from the initial unedited theme (ie, no customizations) So why can't we just paste in the entire updated theme to replace all files?
You're right. The video states the initial commit has nothing but "a fresh theme install without any edits", then moments later he talks about settings and theme files that contain all our customizations 😅. Futhermore, my initial commit is not a fresh theme install. So what then? 🤷
I couldn't find an answer to this. I squashed as many commits as I could (the latest commit to the latest merge commit) then went forward with the rebase. It's annoying because you have to go through and resolve conflicts commit by commit, which can be time consuming if you have a lot of commits. Still not done doing that, so not sure how it will turn out.
Can you please update your instructions on how to edit colour swatches on your website as your current instructions are wrong..... creating a PNG file and adding it to "files" on shopify does not work anymore. Thanks
What do I need to do to prepare for the next theme update? This was my first one, so I started with the unedited original version (4.2.1) of my theme. I upgraded to 4.3.1 and put in all my custom code into a new, now published, branch. As described thoroughly in this great video. For this upgrade I squashed to the unedited 4.2.1 starting point. What will I do for the next one? I don't have a 4.3.1 starting point.
When I rebase Impulse Version 7.3.1 with the temp, it says This branch is up to date with Impulse Version 7.3.1. There are no commits on the current branch to rebase. Though my temp branch has updates to the Impulse Version 7.3.1. How to rebase?
Hi Asfrand, please reach out to our support team directly via support@archetypethemes.co so they can better assist you with your unique situation. Thanks!
This was GREAT until I tried a repo that had merge commits and got this message: Unable to squash. Squashing replays all commits up to the last one required for the squash. A merge commit cannot exist among those commits.
![How To Use Github With Shopify - [Tutorial for Beginners] In 2025](http://i.ytimg.com/vi/QGglcSK9PfY/mqdefault.jpg)
![How To Use Github With Shopify - [Tutorial for Beginners] In 2025](/img/tr.png)
To check out Part 1 of Shopify Github Integration Tutorial --> ruclips.net/video/tGV7a4X8phQ/видео.html
This was extremely helpful. Stepped me through it, with just the right amount of detail. Thank you!
Great videos. I was a little confused by the last requirement at 1:36.
My understanding is that by using Shopify's Github integration, I can no longer use the auto update feature in Shopify, even though I originally added the theme via the Shopify Theme store (I use Dawn). This is because I downloaded the theme files and then uploaded them back into Shopify via Github. I now get the message "Updates are not supported for uploaded themes."
@6:02 you say to copy over all files except certain ones or else we lose customizations, but
@5:22 we've created this branch from the initial unedited theme (ie, no customizations)
So why can't we just paste in the entire updated theme to replace all files?
You're right. The video states the initial commit has nothing but "a fresh theme install without any edits", then moments later he talks about settings and theme files that contain all our customizations 😅.
Futhermore, my initial commit is not a fresh theme install. So what then? 🤷
Thank you so much for this tutorial Thomas!
Excellent video, thanks for making this tutorial! 😃
Awesome tutorial, tnx! 3-way merge ))
What do you do if you have merge commits in your history? Doesn't appear they can be squashed by the method you present at 3:50
I couldn't find an answer to this. I squashed as many commits as I could (the latest commit to the latest merge commit) then went forward with the rebase. It's annoying because you have to go through and resolve conflicts commit by commit, which can be time consuming if you have a lot of commits. Still not done doing that, so not sure how it will turn out.
I have the same question -- and we have thousands of commits over the past 6 months.
Can you please update your instructions on how to edit colour swatches on your website as your current instructions are wrong..... creating a PNG file and adding it to "files" on shopify does not work anymore. Thanks
What do I need to do to prepare for the next theme update? This was my first one, so I started with the unedited original version (4.2.1) of my theme. I upgraded to 4.3.1 and put in all my custom code into a new, now published, branch. As described thoroughly in this great video. For this upgrade I squashed to the unedited 4.2.1 starting point. What will I do for the next one? I don't have a 4.3.1 starting point.
As someone coming from Wordpress, you have to be kidding me lol. Ouch!
When I rebase Impulse Version 7.3.1 with the temp, it says This branch is up to date with Impulse Version 7.3.1. There are no commits on the current branch to rebase. Though my temp branch has updates to the Impulse Version 7.3.1. How to rebase?
I have applied merge rather than rebase. And it has been updated but I have noticed changes in the settings such as the logo has been removed etc.
Hi Asfrand, please reach out to our support team directly via support@archetypethemes.co so they can better assist you with your unique situation. Thanks!
This was GREAT until I tried a repo that had merge commits and got this message:
Unable to squash. Squashing replays all commits up to the last one required for the squash. A merge commit cannot exist among those commits.