May 6, 2010

(XCode)How to resolve Error: 155015 (A conflict in the working copy obstructs the current operation)

It happens on a file i updated from SCM, the solution i found is:

- Backup current working file.
- Run svn revert in console.

No comments: