安装新的CocoaPod时,出现以下错误.
$ pod install
Analyzing dependencies
[!] Pod::Executable pull
A AFHARchiver/0.2.1/AFHARchiver.podspec
A AFWunderlist/1.0/AFWunderlist.podspec
A AFWunderlist/1.1/AFWunderlist.podspec
A AFgzipRequestSerializer/0.0.1/AFgzipRequestSerializer.podspec
...
A wpxmlrpc/0.4/wpxmlrpc.podspec
A zipzap/6.0/zipzap.podspec
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use `'git add/rm <file>'`
as appropriate to mark resolution, or use `'git commit -a'`.
以为我会分享下面的修复.
在XCode 5 Interface Builder中,当我选择一个包含很多行的静态TableViewController时,我可以让它在一个单元格的一半以下但是滚动停在那里.一直到底部编辑/设计界面构建器中下方的静态单元格的诀窍是什么？