wszystkie opcje
trixie  ] [  forky  ] [  sid  ]
[ Pakiet źródłowy: haskell-git-mediate  ]

Pakiet: git-mediate (1.0.9-1 i inne)

Odnośniki dla git-mediate

Screenshot

Zasoby systemu Debian:

Pobieranie pakietu źródłowego haskell-git-mediate:

Opiekunowie:

Zasoby zewnętrzne:

Podobne pakiety:

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!

Inne pakiety związane z git-mediate

  • wymaga
  • poleca
  • sugeruje
  • enhances

Pobieranie git-mediate

Pobierz dla wszystkich dostępnych architektur
Architektura Wersja Rozmiar pakietu Rozmiar po instalacji Pliki
amd64 1.0.9-1 502,2 KiB2 465,0 KiB [lista plików]
arm64 1.0.9-1 492,6 KiB2 808,0 KiB [lista plików]
armhf 1.0.9-1 1 731,5 KiB10 167,0 KiB [lista plików]
i386 1.0.9-1 1 881,8 KiB13 273,0 KiB [lista plików]
ppc64el 1.0.9-1 1 227,8 KiB11 392,0 KiB [lista plików]
riscv64 1.0.9-1+b1 1 687,0 KiB10 762,0 KiB [lista plików]
s390x 1.0.9-1 2 250,9 KiB17 527,0 KiB [lista plików]