V2EX = way to explore V2EX 是一个关于分享和探索的地方
Sign Up Now For Existing Member Sign In
iOS 开发实用技术导航 NSHipster 中文版 http://nshipster.cn/ cocos2d 开源 2D 游戏引擎 http://www.cocos2d-iphone.org/ CocoaPods http://cocoapods.org/ Google Analytics for Mobile 统计解决方案 http://code.google.com/mobile/analytics/ WWDC https://developer.apple.com/wwdc/ Design Guides and Resources https://developer.apple.com/design/ Transcripts of WWDC sessions http://asciiwwdc.com Cocoa with Love http://cocoawithlove.com/ Cocoa Dev Central http://cocoadevcentral.com/ NSHipster http://nshipster.com/ Style Guides Google Objective-C Style Guide NYTimes Objective-C Style Guide Useful Tools and Services Charles Web Debugging Proxy Smore
This topic created in 2975 days ago, the information mentioned may be changed or developed.
ConflictResolver, 一个用于协助解决合并冲突的 Xcode Source Editor Extension.
- 支持三个选项，'Accept Theirs', 'Accept Yours', 和'Keep Both'，一键解决冲突，无需手动删除代码
- 支持跳转到下一个冲突的地方
- 支持 git diff3 style
Github 地址： https://github.com/liaojinxing/ConflictResolver
![Demo][https://github.com/liaojinxing/ConflictResolver/blob/master/ScreenShots/demo.gif]
 | 1 prasanta Mar 10, 2018 via Android pycharm 自带 |
 | 2 HangoX Mar 10, 2018 via Android 估计也就 xcode 没有了。。jetbrain 全家的都很好用 |
 | 3 liaojinxing OP 别的 IDE 很多都有，确实只有 xcode 没有。 |
 | 4 CSwater Mar 12, 2018 不是有 FileMerge 么，配合 SourceTree，风味更佳。 单看 Demo 感觉不是很直观。 |
 | 5 free9fw Mar 29, 2018 假如 Xcode 项目打不开的情况的冲突支持吗 |
Select Language