与故事板文件中的inferredMetricsTieBreakers发生合并冲突 [英] getting merge conflicts with inferredMetricsTieBreakers in Storyboard file

问题描述

每当我在故事板文件中出现冲突时，我通常都可以解决它。但是，我有一个问题，现在两周内出现两次。

Whenever I get a conflict in a storyboard file, I can usually resolve it. However, I have an issue that has now come up twice in two weeks.

在我的Storyboard文件的最底部，我看到名为inferredMetricsTieBreakers的块，有一堆包含在其中的segue标签。似乎我本地仓库中的一些segue与远程仓库中的另一个segue相冲突。为了安全起见，我可以选择两者。但由于这种情况曾经发生过一次，我担心它会继续发生，并最终在我的故事板文件的末尾有一长串的这些segue引用。

At the very bottom of my Storyboard file, I see block named "inferredMetricsTieBreakers", with bunch of "segue" tags contained within. It seems that some segue in my local repo is conflicted with another segue in the remote repo. To be safe, I could just "choose both". But since this happened once before, I'm afraid that it will keep happening, and eventually have a long list of these segue references at the end of my storyboard file.

只是想知道是否有人对文件中的这些标签非常了解，或者我是否应该盲目地继续选择两者而忽略该问题。

Just wondering if anyone is that intimately knowledgeable about these tags in the file, or whether I should just blindly continue to just "choose both" and ignore the issue.

谢谢，
-Dan。

Thanks, -Dan.

推荐答案

同样的事情发生在这里。使用同时选择方法后，我的故事板文件出错。发现在故事板中搜索segue引用会导致在 inferredMetricsTieBreakers 部分中提到一个segue。从列表中删除segue解决了我的破坏版本。

Same thing going on here. Got errors in my storyboard file after using your "choose both" method. Found that searching the storyboard for the segue references resulted in one segue that was mentioned inside the inferredMetricsTieBreakers section. Removing the segue from the list solved my breaking build.

要尝试找出这个 inferredMetricsTieBreakers 的作用，我尝试首先删除整个部分。打破我的构建。接下来我删除了所有项目。在构建期间，Xcode在我的列表中添加了2个新的和不同的segue（在合并之前我有3个）。我正在构建的应用程序工作正常。

To try and find out what this inferredMetricsTieBreakers does, I tried removing the whole section first. Breaking my build. Next I removed all the items. During the build, Xcode added 2 new and different segues to my list (before the merge I had 3). The application I'm building is working fine.

我的结论：删除所有项目并执行干净的构建是安全的。这将使您的故事板保持清洁。

My conclusion: it's safe to remove all the items and perform a clean build. This will keep your storyboard clean.

这篇关于与故事板文件中的inferredMetricsTieBreakers发生合并冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！