I just upgraded my test forum to 1.3 and am trying to get the hang of merging.
1) Select footer template from Outdated Templates List (footer has several edits) and click Merge Changes
2) Highlighted yellow area shows a difference to my modified template
3) This doesn't look like something I want in the template, so I click on Resolve Using Custom Version
4) Outdated Templates List now shows "Custom Version: 1.2.2 Parent Version: 1.3.0 Beta3"
So does this mean that some 1.3.0 footer template code is now gone?
I suppose I should have used Resolve Using Both to keep the 1.3.0 code there as a reference.
I can't find any View History for the footer template. I assume that history is kept only after merging. I want to revert the template to how it was immediately after the upgrade and have another look at what was taken out. I expect that any reverting to the 1.3.0 parent version will wipe out my custom changes.
Can someone post the 1.3.0 footer template code please?