XF 2.0 How does XF merge templates during upgrade

[AndrewSimm]

Let's say I edit the header in one styles, and the next version the XF team makes some enhancements to one of the unedited header elements. Will the changes merge into mine, or once I edit the template, do I have to make all future changes to the template?

 

[Steve F]

If a template you've edited has been changed (becomes outdated) by XF during an update you will see it here: /admin.php?templates/outdated

Also, you will be able to merge changes or resolve any conflicts from that page.

 

[Paul B]

https://xenforo.com/community/threads/template-merging-and-history.48846/

 

[AndrewSimm]

If a template you've edited has been changed (becomes outdated) by XF during an update you will see it here: /admin.php?templates/outdated

Does XF have any logic that attempts the merge or does it see that the template has been edited and skips the merge attempt?

 

[AndrewSimm]

https://xenforo.com/community/threads/template-merging-and-history.48846/

Thank, this makes sense. It seems to work similar to TMS as it looks for a bit of code and changes it if it exist. Is that a fair assessment?

 

[Steve F]

XF updates do not overwrite edited templates or properties, merging is done through user input.