help needed on 3.0.0 update to 3.0.1

[cookiemonster]

i'm a newbie at this, but please bear with me.

I have downloaded the automatic update package and backed up my database, but that's as far as I have gotten.

so, where do i start from here? i have the folder open with the items i need to upload. after going to update folder, do i select "new" or "old"? from there, do i simply upload each item to the appropriate area on my database (all items in the language folder on the update go in the language folder on my DB)?

i appreciate any and all help.

[Erik Frèrejean]

Well unzip the update archive and upload the install directory to the forum root on your server. After that go with your browser to the install folder (http://your-domain.tld/forums/install), and watch the magic happen .

[cookiemonster]

thanks so much.

i feel a bit embarrassed now. i've been mulling over the update for the past few weeks

it's updated now, didn't take but a few minutes. thanks again

[oglach]

what is the best thing to do when you have mods on the file? overwrite or merge or what? ive arcade installed and about 5 different mods like fast reply etc

[stitch626]

You will want to merge those files. If you overwrite it will replace your modded code.

[oglach]

merging wil be ok yeah?

[oglach]

I have 8 merge files and 2 conflict files?

1: includes/acp/
acp_board.php
Number of conflicts: 1


2. includes/
functions.php
Number of conflicts: 2



what do i do with them

[stitch626]

There should be a compare option. This will allow you to see the changes between your current file and the new one.

[oglach]

3 options on each conflict

a) Do not merge - use new file
b) Merge differences and use new file code within conflicting block
c) Merge differences and use modified code within conflicting block

[Erik Frèrejean]

Normally I chose option B and remod those sections where my modded code was replaced by the vanilla code. That way, the code base stays up to date and it isn't that much work mostly just a couple of conflicts.