全部搜尋項
trixie  ] [  sid  ]
[ 原始碼: haskell-git-mediate  ]

套件:git-mediate(1.0.9-1 以及其他的)

git-mediate 的相關連結

Screenshot

Debian 的資源:

下載原始碼套件 haskell-git-mediate

維護小組:

外部的資源:

相似套件:

tool to help resolving git conflicts

In any conflicted state - git-mediate shows you the 2 diffs involved. By applying these diffs to the base version and the other version, you emulate the situation where the patch had already existed when the other had been applied.

Reapply git-mediate, it will validate that you've indeed applied it correctly, and bam: conflict disappeared!

Git-mediate also lets you handle modify/delete conflicts (there's no sane way in git to show what the modification actually was)

Git-mediate also streamlines jumping to the conflicts with your editor, either with the `-e` option to invoke your editor, or via the standard line number format, which is parsed by all major editors, to allow use of "jump to next error" keys.

Git-mediate especially shines with automatic source transformation tools such as renamers.

In a conflicted state, re-apply a rename that caused the conflict, run git-mediate without opening any files, and the conflicts are gone!

其他與 git-mediate 有關的套件

  • 依賴
  • 推薦
  • 建議
  • 增強

下載 git-mediate

下載可用於所有硬體架構的
硬體架構 版本 套件大小 安裝後大小 檔案
alpha (非官方移植版) 1.0.9-1 2,005。1 kB18,440。0 kB [檔案列表]
amd64 1.0.9-1 502。2 kB2,465。0 kB [檔案列表]
arm64 1.0.9-1 492。6 kB2,808。0 kB [檔案列表]
armel 1.0.9-1 1,710。6 kB10,199。0 kB [檔案列表]
armhf 1.0.9-1 1,731。5 kB10,167。0 kB [檔案列表]
hppa (非官方移植版) 1.0.9-1 2,033。0 kB18,424。0 kB [檔案列表]
i386 1.0.9-1 1,881。8 kB13,273。0 kB [檔案列表]
ia64 (非官方移植版) 1.0.9-1 2,276。2 kB57,235。0 kB [檔案列表]
m68k (非官方移植版) 1.0.8.1-1 1,116。7 kB9,687。0 kB [檔案列表]
mips64el 1.0.9-1 1,926。8 kB19,168。0 kB [檔案列表]
ppc64 (非官方移植版) 1.0.9-1 1,191。9 kB13,793。0 kB [檔案列表]
ppc64el 1.0.9-1 1,227。8 kB11,392。0 kB [檔案列表]
riscv64 1.0.9-1+b1 1,687。0 kB10,762。0 kB [檔案列表]
s390x 1.0.9-1 2,250。9 kB17,527。0 kB [檔案列表]
sparc64 (非官方移植版) 1.0.9-1 1,427。1 kB24,185。0 kB [檔案列表]
x32 (非官方移植版) 1.0.8.1-1 2,902。0 kB11,295。0 kB [檔案列表]