Outdated Templates Not Merging Properly

When I hit automatic merge, it says it is successful:


But if I hit the manual merge button, this appears before even getting to the template changes screen, right after I hit the "merge" button:



This is a 'vanilla' test build with only official addons installed.

Читать далее...