Can't merge with other branch.

[Natthawat Sudsang]

I working at root and I create new branch.
After I committed in branch and i want to merge into root i found this error "svn: E195016: Cannot merge into a working copy that has local modifications".
(following attached image)

My partner found this problem same me. 

How to resolve this problem.

Thank you very much.

P.S. sorry for my poor english.

Reference:
 Xcode : version 6.1
 svnX : version 1.3.4

[Natthawat Sudsang]

I working with Root and I want to merge with other branch from my partner.
I can't merge. Error message is "svn: E195016: Cannot merge into a working copy that has local modifications" following picture that was attached.

My partner try to merge into Root. He got same my error.

How to resolve this problem.

Thank you very much.

Reference
svnX : version 1.3.4
Xcode : version 6.1

[chris]

On Thursday, 14 May 2015 13:58:30 UTC+1, Natthawat Sudsang wrote:

I working at root and I create new branch.
After I committed in branch and i want to merge into root i found this error "svn: E195016: Cannot merge into a working copy that has local modifications".
(following attached image)

My partner found this problem same me. 

How to resolve this problem.

You probably need to either commit or revert any changes in your working copy before trying to merge into it.

Also, your screen shot suggests that you are receiving this message from Xcode.  If so, it probably has nothing to do with svnX.