Xcode树在合并时发生冲突

本文介绍了Xcode树在合并时发生冲突的处理方法，对大家解决问题具有一定的参考价值，需要的朋友们下面随着小编来一起学习吧！ 问题描述

我正在与git合作，每次我们尝试合并代码时，我们都会遇到树冲突. 我们目前正在使用git flow，通常会从开发开始，在完成任务后，我们中的一个将一个功能合并到另一个功能中，然后再将其合并到开发中. 问题是，每次我们尝试将一个功能合并到另一个功能时，我们在xcode中都会遇到树冲突，而我们不知道如何解决.

I'm working in team with git and every time we try to merge code we have a tree conflict. We're currently working with git flow and we usually start features from develop, when the task is finished one of us merges one feature into the other and then merge it into develop. The problem is than every time we try to merge one feature into another we have a tree conflict in xcode and we don't know how to fix it.

错误消息是:由于一棵或多棵树冲突，无法执行该操作."

The error message is: "The operation could not be performed because of one or more tree conflicts."

推荐答案

这也发生在我身上.问题是master分支具有未提交的更改(与另一个中的更改无关).切换到master并提交更改，使我可以将功能分支合并回master.

This happened to me too. The problem was that the master branch had uncommited changes (unrelated to the changes in the other one). Switching to master and committing the changes allowed me to merge the feature branch back into master.

尝试在所有分支上落实所有更改，然后在此之后再次尝试合并.

Try committing all the changes on all the branches and try the merge again after that.