Home Sign Up Sign In
爱意满满的作品展示区。
Advertisement
liaojinxing

分享一个用于解决 merge 冲突的 Xcode Extension

  •   
  •   liaojinxing · Mar 10, 2018 · 2544 views
    This topic created in 2996 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

    No Comments Yet
    XcodeextensionAccept冲突
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Solana   ·   844 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 39ms · UTC 21:34 · PVG 05:34 · LAX 14:34 · JFK 17:34
    ♥ Do have faith in what you're doing.