Hjälp! Conflict files .. Uppgradera till 3.0.4

[bazz]

Hejsan
Jag försöker uppgradera mitt forum till 3.0.4. Har först uppgraderat till 3.0.3 och det gick bra men nu när jag ska över till 0.4 så kommer problemen.
Jag har en del moddar på forumet och undrar hur jag ska gå vidare när jag fått medelande om att det är konflikter i filer som är moddade,

Då är frågan hur ska jag göra för att få behålla mina moddar?!.. hade ett rent helvete att få allt att fungera och är lite nojjig nu.
Har tre val:
1. Do not merge - use new file
2. Merge differences and use new file code within conflicting block
3. Merge differences and use modified code within conflicting block

Vad gör man??
Mvh Bazz


Så här står det.


Conflict files

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 loosing the changes from the newer file.
Modified file producing conflicts

includes/acm/
acm_file.php
Number of conflicts: 3
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/db/
dbal.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/
functions.php
Number of conflicts: 2
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/
functions_content.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/
functions_display.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/
functions_messenger.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/
functions_module.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/
functions_posting.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/search/
fulltext_native.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/
session.php
Number of conflicts: 2
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/ucp/
ucp_activate.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/ucp/
ucp_groups.php
Number of conflicts: 2
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/ucp/
ucp_main.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

includes/ucp/
ucp_pm_compose.php
Number of conflicts: 2
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

language/en/
common.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

language/en/
install.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

language/en/
ucp.php
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

memberlist.php
Number of conflicts: 2
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

styles/prosilver/template/
mcp_front.html
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

styles/prosilver/template/
mcp_post.html
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

styles/prosilver/template/
memberlist_body.html
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

styles/prosilver/template/
search_results.html
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

styles/prosilver/template/
ucp_main_subscribed.html
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

styles/prosilver/template/
viewforum_body.html
Number of conflicts: 1
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]

viewtopic.php
Number of conflicts: 2
[ Show differences/conflicts ]

Do not merge - use new file
[Show resulting file]

Merge differences and use new file code within conflicting block
[Show resulting file]

Merge differences and use modified code within conflicting block
[Show resulting file]



Update method

You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.

[tumba25]

Har du inte valet ett använda den gamla filen?

Om du inte har det föreslår jag att du sparar undan dina gamla och använder dom nya. Sen kopierar du tillbaka dina gamla och gör ändringarna manuellt.

Du får gå genom dom och titta efter skillnader och ta reda på vilket som hör till uppdateringen och vilket som hör till en MOD. Jag vet att det låter omständigt, men tror inte det finns något bättre sätt om du vill uppgradera och ha kvar dina ändringar.