I've just logged into one of my sites only to see a load of outdated templates, which I swear were all up to date two days ago after doing the one click upgrade following the security release. I'm really not sure why? In the ACP it says I'm on v2.2.19 Patch 1
When I click merge I get this on all of them?
The custom template is out of date but has been edited more recently than the parent. Merging can only be done by hand.
I believe I figured out the source of this, it's to do with change accumulated across two nested child themes
(Master Theme - Hidden in theme UI, but always there) -> Core theme from theme dev -> Child to core theme from theme dev to add features (nested theme level 1)-> My child theme for my further style customisation (nested theme level 2)
With some of my significant additional style changes applied to the theme dev's child theme, which must have been been applied before I made my own sub-sub theme, instead of just the pure final nested child theme where all customisations should have gone, so change have become out of sync with their parents and the style history isn't clean enough for a 3 way merge. I'll need to manually clean some of this up, which should make upgrading a lot easier in the future.
