I tried to update my theme to latest version and I got this error:
A copy of ThemeNameV2.6 was added to your theme library, but your code edits could not be included because of the following issues:
Rebase failed with conflicts: [“sections/blog-posts.liquid”, “sections/collection-list.liquid”, “sections/contact-form.liquid”, “sections/footer.liquid”, “sections/header.liquid”, “sections/main-search.liquid”, “sections/product-recommendations.liquid”, “sections/products-list.liquid”, “sections/text-columns-icons.liquid”, “sections/text-columns-images.liquid”]
Does it mean that because of this conflict my theme was not updated?
Also, does it mean that in all these files I have custom code?
Your theme WAS updated, but as a new copy in your theme library (you should see “ThemeNameV2.6” there). However, the custom code changes you made to those 10 files couldn’t be automatically merged because the theme developer also changed those same files in the update. That’s what the conflict means.
Yes, it means you have custom code in all those files. The update couldn’t figure out how to combine your edits with the developer’s changes, so it skipped them.
What you need to do:
Don’t delete your current live theme yet. It still has all your working customizations.
Open both themes side by side: your current live theme and the new updated copy. For each of the 10 conflicting files, compare what you changed vs what the developer changed, and manually merge your customizations into the updated version.
A good way to do this: open each file from your live theme, search for your custom code (anything you added or modified), and then add those same changes to the corresponding file in the updated copy.
Preview the updated copy thoroughly before publishing it. Test all the sections mentioned in the conflict list (header, footer, blog posts, contact form, etc.) to make sure everything works.
If you don’t remember exactly what you customized, you can use a diff tool (like diffchecker.com) to compare each file between the two theme versions.
That will highlight exactly what’s different.
Hi, your theme was updated as a new copy in your library. Your custom code in those files wasn’t merged automatically due to conflicts. You need to manually copy your custom changes from your current theme to the new one for those files. Use a diff tool to spot your edits easily. Don’t delete your live theme until you finish testing the new one.
Quick answers to your two questions first. Your live theme is fine and untouched. V2.6 just got added as a separate unpublished copy, so nothing went live and nothing got lost. And yes, all 10 of those files have custom code in them. Either you, a developer, or an app edited them, and the theme author changed those same files in the update, so the two sets of edits collided and Shopify wouldn’t guess which to keep. Every other file updated cleanly with your changes carried over, it’s only these 10 that need hands on them.
For 10 files, the cleanest way is to do it locally rather than eyeballing in the browser editor. Download both themes as zip (Online Store > Themes > the three dots menu > Download theme file) and open them in VS Code, then diff each conflicting file between your live theme and V2.6. That shows you exactly what differs, you copy only your custom bits into the V2.6 version, preview it fully, and publish only once header, footer, search and the rest all check out.
One heads up, don’t trust the little “modified” dots in the code editor to tell you what you changed. They get unreliable once a theme has been duplicated, so let the diff be your source of truth.
For what it’s worth, 10 conflicting files including header, footer and search is a real merge job and easy to half fix in a way that breaks something subtle later. If you’d rather not risk it, happy to take a look and give you an honest scope.