Xcode Merge Branch Error

The principles and operating procedures are reproduced in the following two articles,

The SVN client software I'm using is the Versions.app under Mac v1.06

This version contains a bug that has been developed by a multi-person

Bug solution See the two articles I reproduced before ~

In addition, as the first article reproduced in this article, I am also deeply affected by the frequent update of userinterfacestate.xcuserstate files,

To avoid this problem, versioning of xcuserstate type files can be ignored in Versions profile ~/.subversion/config.

In addition, the Versions configuration file is in the hidden directory, can be in the Finder through CMD + SHIFT + G directly to the hidden directory ~

Split Line ***************************

Article title:

Get rid of Userinterfacestate.xcuserstate's obsession with Xcode versioning (git)

Reprinted from: http://alexrezit.42qu.com/10280223

Today in Xcode commit in the time userinterfacestate.xcuserstate this file for a few seconds to update, stirring people not quiet, with. Gitignore invalid. Then, enter in the terminal:

$ git rm--cached iledger.xcodeproj/project.xcworkspace/xcuserdata/alex.xcuserdatad/userinterfacestate.xcuserstate $ git commit-m "removed the stupid strange file that shouldn ' t is tracked" $ git push

Get!

Split Line ***************************

Article title:

XCode SVN

Reprinted from: http://renxiangzyq.iteye.com/blog/850762

1. Create the project in XCODE.
2. Setup subversion in XCODE and select the Subversion repository for this project.
3. Use Xcode SCM > Repository and click on the IMPORT icon. This would move the local copy to the Subversion repository.
4. Now delete your local copy (or move it to another location just in case).
5. Finally CHECKOUT the project from subversion (this would create the subversion. SVN folders, ...).
6. Reselect the Subversion repository for this project.
7. Commit the entire project.

The first step is to configure Subversion
When SVN is used in Xcode, you need to configure subversion. Leopard comes with SVN, but in Xcode's project file, not all files are suitable for inclusion in SVN for management, such as compiled files and files generated during the compilation process, these files are not part of the source code, you should tell SVN ignore, method: Edit ~/.subversion/ Config file
1. Find the Global-ignores line, remove the comment, edit it into
global-ignores=build*~.nib*.so*.pbxuser*.mode*.perspective*
Some files in the Xcode project file are text files that need to be told to SVN because SVN can better manage text files (who knows who)
2. Locate Enable-auto-props=yes to remove the comment and declare the following text file in the [auto-props]section]
*.mode*=svn:mime-type=text/x-xcode
*.pbxuser=svn:mime-type=text/x-xcode
*.perspective*=svn:mime-type=text/x-xcode
*.pbxproj=svn:mime-type=text/x-xcode

Xcode Merge Branch Error