XF 2.3 Outdated Templates Merge - a little confused

[Jon12345]

Let me start off with saying I am probably a bit thick. But I am having problems understanding what might be simple for others, so I'm seeking a little direction.

After upgrading from Xenforo 2.2 to 2.3, I am confronted with the following:



The Automatically merge option didn't do anything, so I clicked the Merge button, and I get this:



So, I have some questions about this, before I completely mess up my site.

1. What do the 4 "Deleted" sections of different colours mean? Was there code under those colours? I just don't understand this!

2. Can I click one of the Resolve buttons, and then am I supposed to click the Merge button at the bottom of the page?

3. Do I have to make a decision on every row that says Resolve (I have 13 of them), before I click Merge at the bottom of the screen? Or can I say make a decision on just one of the Resolve rows, click Merge, observe the effects to my forum, and then later come back to do another row?

4. Which button would you click if you are not sure what to click?

5. Is there any way to get back to a pre-merge state in case I click the wrong Resolve button and mess things up?
Is my site, after doing a 2.3 update, showing a clean pre-merge template, or is it showing the template that already has the additional code?

Thanks. A lot of questions but I am that confused!

 

[philmckrackon]

Did you see this? It is a great read.

XF 1.2 Thread 'Template Merging and History'

Apr 18, 2013

In our second updating about template improvements, we're focusing on tools to make it easier to keep your changes up-to-date and to see what changes you've been making.

Template Merging
First up is the ability to merge changes into templates after upgrading XenForo, an add-on, or a distributable style.

This is done via the existing outdated template interface:

You have the option to automatically merge changes if possible. This will merge any updates where a conflict is not detected. If a conflict is detected, you will need to use the manual merge...

• Mike
• Replies: 69
• Forum: Have you seen...?

• 

 

[Jon12345]

Thanks for the link. I read that thread now.

I tried the merge and now my site is down. I've opened a thread specifically about this.

Perhaps I should just try to use the default template and then install all my addons from scratch again.

 

[Mr Lucky]

and then install all my addons from scratch again.

I have found that anything in the merge templates feature is unlikely to be from an addon as they are usually template modifications not changes to the template. Any of the yellow bits are from my edits, and as soon as I find something there I’m not sure about I will revert and start from scratch.

I always have a copy of the style I can refer to and I also add a comment in the template to indicate my edits saying what they are for. It is usually something that has to be done after coffee but before wine.

 

[Jon12345]

I've reverted to default and will just start from scratch without any of that Merge stuff.