XF 1.5 updating my Xenforo from 1.5.1 to 1.5.12 merge or overwrite?

[Sam F]

Hi I'm updating my Xenforo from 1.5.1 to 1.5.12 merge or overwrite?

on your upgrading page
https://xenforo.com/help/upgrades/

it States:
It is important that the files on the server and what you're uploading are "merged". Otherwise you may lose some files and data.

then it say that your must overwrite existing files?

4. You should be prompted to confirm that you want to overwrite the existing files; you must do this.


This got me a little confused?
how can you do both?

 

[Paul B]

You merge the directories and overwrite the files.

 

[Sam F]

Hi Brogan

OK, I'm using FileZilla

and these are my choices, what would I select?

Thanks

 

[Paul B]

That should work.

 

[Sam F]

OK, so wen it say s overwrite, this means that it will merge the directories and overwrite the files.

I'm just double checking, don't want to mess up.

Thanks

 

[whynot]

this means that it will merge the directories and overwrite the files.

It means that on the server it will overwrite existing files and include any new files.

 

[Sam F]

Thanks My update went great.