我有两个分支,我试图在xCode 4.5中合并.解析两个冲突的文件并按"合并"按钮后,合并屏幕消失,没有出现错误,看起来它是成功的.但与我之前使用xCode 4.4的经验不同,实际上没有提交任何内容.如果我尝试手动提交所有已更改的文件,则会显示"致命:在合并期间无法进行部分提交"的错误.没有迹象表明如何在xCode中继续.
如果我从命令行执行git status,这就是我得到的.两个"not staged for commit"文件是我在xCode中解决的冲突.我知道我可以尝试使用不同的工具进行合并,但我喜欢xCode实用程序,如果它不再可靠,我将会感到沮丧.其他人看到并解决了这个问题？
# On branch ios6
# Changes to be committed:
#
# modified: Flurry/libFlurry.a
# modified: Network Commuting/Constants.h
# modified: Network Commuting/LegMapViewController.m
# modified: Network Commuting/Logging.h
# modified: Network Commuting/Nimbler Caltrain-Info.plist
# modified: Network Commuting/Plan.m
# modified: Network Commuting/PlanStore.m
# modified: Network Commuting/RouteDetailsViewController.h
# modified: Network Commuting/RouteDetailsViewController.m
# modified: Network Commuting/RouteOptionsViewController.m
# modified: Network Commuting/SettingInfoViewController.m
# modified: Network Commuting/TEXTConstant.h
# renamed: Network Commuting/TestFlightSDK1/TestFlight.h -> Network Commuting/TestFlightSDK1-1/TestFlight.h
# new file: Network Commuting/TestFlightSDK1-1/libTestFlight.a
# deleted: …