由于与UserInterfaceState.xcuserstate冲突而无法合并 [英] Cannot Merge due to conflict with UserInterfaceState.xcuserstate

问题描述

我创建了一个分支并进行了大量更改。我提交了更改，然后将更改存档。然后，我切换到master分支并尝试进行合并。它说我未提交更改。因此，我在master分支上进行了一次提交，以了解其含义。它说有一个名为UserInterfaceState.xcuserstate的文件已被修改。所以我提交了更改（不确定更改是什么）。然后我尝试再次合并。然后，它将打开一个合并窗口，并指示与UserInterfaceState.xcuserstate发生冲突。所以我回到分支，发现现在需要提交相同的文件。这以前没有出现过。所以我提交了它，然后回到了master分支。我再次尝试合并，但由于未提交的更改而无法合并。果然，再次需要提交UserInterfaceState.xcuserstate。我承诺并尝试合并。冲突也有同样的问题。这是一个恶性循环。

I created a branch and made a bunch of changes. I committed the changes and then archived the changes. Then I switched to the master branch and tried to do a merge. It said I had uncommitted changes. So I did a commit on the master branch to see what it was talking about. It said that there is a file called UserInterfaceState.xcuserstate that was modified. So I committed the change (not sure what the change was). Then I tried to merge again. It then opens up a merge window and indicates that there is a conflict with UserInterfaceState.xcuserstate. So I went back to the branch and found that that same file is now needing to be committed. This did not show up before. So I committed it and went back to the master branch. Again I tried to merge but cant because of uncommitted changes. Sure enough, UserInterfaceState.xcuserstate is once again needing to be committed. I committed it and tried to merge. Same problem with conflict. Its a vicious circle.

此文件是什么，我该如何解决所报告的冲突。它没有显示在我的项目导航窗口中。此外，它不在unix文件系统中。我完全被困住了。有什么建议吗？我正在使用xcode 4.5.2

What is this file and how do I resolve the reported conflict. It does not show up in my project navigation window. Furthermore, it is not in the unix file system. I am totally stuck. Suggestions? I am using xcode 4.5.2

推荐答案

UserInterfaceState.xcuserstate Xcode保存您的GUI状态，例如窗口位置，打开的选项卡，项目检查器中的扩展节点等。

UserInterfaceState.xcuserstate is where Xcode saves your GUI states, such as window positions, open tabs, expanded nodes in the project inspector etc.

简单地调整Xcode窗口的大小将导致此文件更改并被更改。标记为由您的源代码管理系统修改。您可以使SCM系统忽略对项目本身不重要的特定文件。

Simply resizing the Xcode window will cause this file to change and be flagged as modified by your source control system. You can make your SCM system ignore specific files that are not important to the project itself.

Git：针对Xcode项目的Git忽略文件

Subversion：使用Xcode 4的SVN忽略模式

这篇关于由于与UserInterfaceState.xcuserstate冲突而无法合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！