xcode merge branch into master failed

在xcode中合并分支到master失败，检查到冲突，从 stackoverflow 搜到一个可用的答案。

http://stackoverflow.com/questions/6006737/git-merge-errors

用terminal执行以下命令合并成功。

# Switch to the topic branch:
git checkout 9-sign-in-out

# Create a merge commit, which looks as if it's merging in from master, but is
# actually discarding everything from the master branch and keeping everything
# from 9-sign-in-out:
git merge -s ours master

# Switch back to the master branch:
git checkout master

# Merge the topic branch into master - this should now be a fast-forward
# that leaves you with master exactly as 9-sign-in-out was:
git merge 9-sign-in-out