Thanks for the advice, Don. I backed up the database, but I made the (huge) mistake of not tagging my cvs repository at the state it was at before I imported the new vendor tags. I'm not sure if it's going to be possible to easily go back to where I was at.
By the way, I want to correct my comment above about cd /web/safe4all-dev/ and then doing the conflict report. That appears to be the wrong way to go about it. You're supposed to create it in another directory.
Any idea of how to get around the error I'm having? Isn't the message_catalog related to internationalization? (I don't know why I thought that). It seems strange that the APM would barf on something like this. I thought it was supposed to handle the upgrades more smoothly. I suppose I could have screwed something up, but I was pretty careful...
Help? 😊
