Skip to content
doless

02Shopify app

ThemeMerge

Merge two Shopify themes and keep every edit, instead of redoing changes by hand.
Status
Shipped
Year
2026
ThemeMerge screenshot

01The boring part

The problem

A developer works on a theme copy while the client keeps editing the live theme. At launch, someone has to find and redo every change twice.

02What we built

The fix.

  • A three-way merge of the live theme and a working copy, file by file and setting by setting
  • Theme-editor aware: section and block settings in JSON merge cleanly, not just the Liquid
  • Only real conflicts need a decision; everything else merges automatically
  • Apply the result straight to the working copy, or download the merged files

Built with

  • Shopify Admin API
  • Liquid
  • React Router
  • Polaris
  • Node.js
Next projectDeconflictFinds the apps fighting over your storefront, and what each fight costs in load time.
Deconflict screenshot

Gotsomethingboring?

Tell us the part of your week you'd happily never do again. We'll tell you how we'd automate it, for free.

Hand it over↗