How can I fix code conflicts after a theme update?

Hi all,

Just downloaded the latest version of ‘editions’ theme and received the message:

Your code changes won’t be included because one or more changes conflict with the update. After the updated theme is added to your theme library, you will be able to copy your code over or re-configure some apps.

I cannot remember what code changes I made however I can see on preview of the new version that my background image is missing. So theres one change there.

How do I find out all code changes I made?

How do I go about fixing the code to work with the new version of my theme?

Any tips for how to go about this appreciated

Re

Unfortunately, there’s not really any good way to see a list of the changes you made.

Usually, you’d just look at your old theme within the coding editor, and then next to any templates/sections/snippets that you edited, you would see a little black circle next to their names (which indicates that changes have been made). But this isn’t fool-proof – especially if you’ve ever made duplicate copies of your theme, then you would lose the black dots next to the file names. Also, the CSS and JS templates will never show a black dot, so you would be completely in the dark with those files.

And even if you do see the black dots, you would have to figure out manually, which bits of coding you changed, as it won’t highlight what the changes were.

All this is to say that re-doing the coding edits is a VERY manual process, and in most cases, it’s best to just make the changes again from scratch, instead of attempting to local the previous coding and then copy-and-pasting it over.

Sorry to be the bearer of bad news!

Hi Stephen,

Thanks for the input. Thats OK ..old version still works fine!

I should have recorded changes in a txt file as I went really. As it happens im wanting a bit of a redesign so I may stick with the old version of my theme for now and then develop a revamped site, recording changes as I go.

Thanks

Paul