Collision of files when doing the "svn up" command via ssh

I've been trying to update the server with the "svn up" command via ssh connection, and there was a notification saying that there is a collision of files - it was a jobs_controller file (cakephp).

So I've chosen th开发者_JAVA技巧e postpone option. But the update crashed the server so I reversed the changes by putting back again the old ones, but the job section on the site still doesn't work.

How can I fix it?

---

I assume that your site is in SVN and you check it out onto your server to run it? In which case it sounds like either you still have differences between the copy you are running and what is in SVN, or that what is in SVN doesn't work (ie. Is missing changes that you had locally before reverting). You can use:

svn -u status

to get a list of the files that are different between your local copy and the latest copy in SVN. Also use:

svn diff <filename>

To see differences between that file locally and the same file in SVN.

---

Problem solved, the file on the server was corrupted.