XF 2.2 Git branching and XF styles causes a lot of issues

[Rasmus Vind]

I updated to the latest XenForo and fixed some of the outdated templates.

Then switched to an older branch and did:

docker-compose exec php php cmd.php xf-dev:import -a VindIT/Downloads
docker-compose exec php php cmd.php xf-designer:import Reforged
docker-compose exec php php cmd.php xf-designer:import NightElf
docker-compose exec php php cmd.php xf-designer:import Undead
docker-compose exec php php cmd.php xf-designer:import Orc

To sync my filesystem to the database.

I got some outdated templates again but this time the merge does not work. It gives me the dreaded:

The custom template is out of date but has been edited more recently than the parent. Merging can only be done by hand.

I decided to have a looksie and found that last_edit_date on templates is not reverted upon import. I don't know what it should revert to but I have a feeling the last_edit_date should be stored next to the hash or something in _metadata.json.

It definitely does not feel good that state is not synced with the filesystem proper.

Or am I doing this wrong?

I don't want to check in the XML files, but I do check in the _metadata.json files.

 

[Rasmus Vind]

@Mike, do you have any suggestions for how best to approach this?