I'm trying to resolve a tree conflict from SVN in Xcode. From the answer here I should simply resolve the conflict using the command-line. No problem, I've got some experience with SVN command line, so I do exactly that svn merge ^/project/trunk svn resolve --accept working conflictedFile1.m svn resolve --accept working conflictedFile2.m svn resolve --accept working conflictedFile3.m svn ci. -m 'merge: from trunk' Then I go back to Xcode and just to make sure everything is happy and try to test that everything 'took'. I do 'Source Control ->Update' and then 'Source Control ->project ->Merge from Branch ->trunk' and I again get the stupid error message: 'The operation could not be performed because of one or more tree conflicts.' And the additional message 'The files conflictedFile1.m, conflictedFile2.m, and conflictedFile3.m had a tree conflict.' In fact my question is not how to resolve this tree conflict, but how do I tell Xcode that I already did resolve the conflict?

Ignore some files by default. A zip that had a.DS_Store r folder it turns it. Incompatible Thumbs.db format and now you're getting conflicts for a file. A way to hide the.DS_Store files in the tree view? My project folder is showing.DS_Store and.git file despite the Core Settings >Ignored Names containing the.

Is there some out-of-date svn database somewhere that I need to refresh/delete? Did I resolve this wrong in the first place? Bonus question: It would be really nice to continue to use Xcode's builtin SVN features to do merges, etc. I can use the command line but I'd really rather not for things like merges, when I have a builtin merge-diff tool in my IDE. In general, any advice on using SVN in Xcode properly is greatly appreciated.

Therefore, if there is any specific advice anybody can give me to prevent this from happening in the future, I'll be very happy. What I did was: (1) branch from trunk to Branch1 (2) add a file on Branch1 (as well as other edits) (3) branch from Branch1 to Branch2 (4) make edits (no new files) (5) merge from Branch2 to trunk (6) merge from trunk to Branch1 ->tree conflict with the files originally created here.

In Xcode I noticed that.DS_Store and *.xcuserstate always change and don't need to be commited. So, I wrote a.gitignore file that contains this:.DS_Store *.xcuserstate among other entries. Horoscope Software Free Download In Sinhala. Then I used: git rm --cached *xcuserstate git rm ---cached.DS_Store To remove the these file types already under version control. However, when I go to merge Xcode tells me that there are changes that need to be committed.

Those changes include.DS_Store files and.xcuserstate files. So, I tried this: find. -name.DS_Store -print0 xargs -0 git rm --ignore-unmatch find. -name *.xcuserstate -print0 xargs -0 git rm --ignore-unmatch and I got the same result. How do I remove these files from source control for good? You need to commit your change after removing them from the staging area. As you did already, run: $ git rm --cached path/to/.DS_Store $ git rm --cached *.xcuserstate Note, you may have some in other directories, so you may need several invocations to get them all.

At this point, your removals are staged in the index, but there's still more to do: add your.gitignore, and commit the final result: $ git add.gitignore $ git commit -m 'Remove and ignore.xcuserstate and.DS_Store files.' Now they'll be removed from the repository, and ignored in the future. Note: this will remove the files for other people, even though you used git rm --cached locally. Unfortunately, there isn't much you can do about this. Also, the files are still in your history, so depending on what you do, you may see them in other branches until things get merged and all your branches are based on something that has the new commit.