简体繁体 English

git与XCode并忽略合并时的.xcodeproj？

[英]git with XCode and ignoring .xcodeproj on merge?

原文 2010-09-23 19:45:20 9 1 xcode/ git

I'm getting up to speed on using git with XCode but have run into a situation that I'm not quite sure how to handle. 我正在加快在XCode上使用git的速度，但是遇到了一种我不太确定如何处理的情况。

I have a branch of my project " branchA " that has a build target base SDK of iOS 3.2 我有一个项目“ branchA ”的分支，该分支具有iOS 3.2的构建目标基本SDK

I have " branchB " that has been forked from branchA that has a build target base SDK for iOS4.2 我有从branchA分叉的“ branchB ”，该分支具有针对iOS4.2的构建目标基本SDK

I'm continuing with development on both branches, branchA with functionality that doesn't depend on SDK4.2 features, branchB for those features that do depend on 4.2 我将继续在两个分支上进行开发， branchA具有不依赖于SDK4.2功能的功能， branchB用于那些确实依赖于4.2的功能

From time to time, I want to merge the changes made in branchA into branchB . 我不时要将合并在branchA所做的更改合并到branchB 。
This of course results in some conflicts that I can easily correct -- except those that occur in the .xcodeproj file 当然，这导致了一些我可以轻松纠正的冲突-除了.xcodeproj文件中发生的冲突之外

How can I tell git not to merge the .xcodeproj file from branchA into branchB -- in essence, keep the .xcodproj file in branchB and ignore any differences it may have with branchA ? 我怎样才能告诉git不要将branchA的.xcodeproj文件合并到branchB -本质上，将.xcodproj文件保留在branchB中，并忽略与branchA任何区别？

1 个解决方案

As I detail in this SO answer , you can use 正如我在此SO答案中详述的那样，您可以使用

a merge driver with a keepmine script . 具有keepmine脚本的合并驱动程序。
or a git rerere to record one merge resolution and keep re-applying it. 或git rerere记录一个合并分辨率并继续应用它。