I'm having problems updating my phpBB board to the newest version and would appreciate some help. I am using the automated update script. I have uploaded all new files that were in the zip file provided by the update script. I have also deleted the obsolete ones. However, the script will still not allow me to finish the installation. I am stuck with a list of files that the script wasn't able to merge:
Fine. I have done that. I investigated the conflicts and resolved them manually. Now I am good to go. I don't need a preferred merging method - but maybe I should be worried that I don't see one, either? All I can do is hit "update files", upon which more of the same duplicate files are added to "Conflict files". Additionally, two of the files I have investigated and resolved manually (see above) have now been added to the "modified files" list (which seems to indicate that the script wants to alter them AGAIN - which does not sound exactly promising)."The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in losing the changes from the newer file."
Where do I go from here?