Ubuntu
haskell-git-mediate package

haskell-git-mediate 1.0.9-1 source package in Ubuntu

Changelog

haskell-git-mediate (1.0.9-1) unstable; urgency=medium

  * New upstream version.

 -- Clint Adams <email address hidden>  Tue, 05 Sep 2023 16:10:19 -0400

Upload details

Uploaded by:
Debian Haskell Group
Uploaded to:
Sid
Original maintainer:
Debian Haskell Group
Architectures:
any
Section:
misc
Urgency:
Medium Urgency

See full publishing history Publishing

Series Pocket Published Component Section
Oracular release universe misc
Noble release universe misc

Downloads

File Size SHA-256 Checksum
haskell-git-mediate_1.0.9-1.dsc 2.3 KiB 33565baafcd41c9b62eada0393e568d073b5256ecb13ba143de1711045d3f1fd
haskell-git-mediate_1.0.9.orig.tar.gz 17.6 KiB 299aa76f10bb94c62f0f3b68902ed09a6151e5f6feaef01efd07e164e1692aad
haskell-git-mediate_1.0.9-1.debian.tar.xz 1.9 KiB 91956071dbe55d9fd5c2abdefa4a6d673f6e35158713df75e2e907aca87409e2

Available diffs

No changes file available.

Binary packages built by this source

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!