ConflictResolver, 一个用于协助解决合并冲突的 Xcode Source Editor Extension.
- 支持三个选项，'Accept Theirs', 'Accept Yours', 和'Keep Both'，一键解决冲突，无需手动删除代码
- 支持跳转到下一个冲突的地方
- 支持 git diff3 style
Github 地址： https://github.com/liaojinxing/ConflictResolver
爱意满满的作品展示区。
This topic created in 2994 days ago, the information mentioned may be changed or developed.
No Comments Yet
Select Language