Xcode and SCM conflict error

I get the following error, although I am the only person working on this project.

> Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed

why this happens, since all I keep doing is to execute the project every time before doing a serious encoding. I committed three times, now it no longer allows, as this causes this error.

+3
source share
3 answers

You have a conflict to resolve in svn. If this is not one of the files, check to see if this tree conflicts.

From the SVN 1.6 release notes :

Subversion 1.6 , " ". , .

, , . , , , .

, Subversion " ", , , . - .

, , HEAD, . Subversion 1.5 no-op, "" , .

+3

, , :

prompt $svn resolve --access working yourfilenamehere

yourfilenamehere

xcode. !

+8

, Versions, " " , , , .

0

Source: https://habr.com/ru/post/1718370/


All Articles