The admin area of my website is messed up after upgrading from 2.1.4 - 2.2.1. I cannot even access the “settings” and “design” area from the top menu. I have resisted upgrading because this happens every time.
I am also confused about resolving local modification conflicts after upgrade as well. I don't even remember the modifications I made, but I know there weren't a whole lot. How do you know if there is a conflict?
Any help would be greatly appreciated. I will attach a screenshot of my admin area.
The site is:
www.bevcorpindustries.com
I haven't noticed any problems with the customer area, just the admin side.
Mindy
Mindy,
First, clear your browser's cache/history. That should resolve your display issue.
As for the conflicts, you'd have to go to Administration => Upgrade Center => Installed Upgrades. From there you will see all of the files that were changed. If you go down to your most recent upgrade, you will be able to see the most recently changed files. With those, you can click on “Changes” to see the different changes and decide what needs to be brought over or not.
I hope that helps,
Brandon
if you want to keep the changes to the files, how do you? Do you have to go back into the files and re-apply the changes?
Yes, you have to re-apply changes. The newer files are what's present in your current store.
This is a really good example of why bracketing changes with comments is a good idea. It makes resolving conflicts much easier. I.e. in a template:
{* MyInitials: start of xyz change }
changed code
{ MyInitials: end of xyz change *}