|
0 |
Source: haskell-git-mediate
|
|
1 |
Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
|
|
2 |
Uploaders: Clint Adams <clint@debian.org>
|
|
3 |
Priority: optional
|
|
4 |
Section: haskell
|
|
5 |
Rules-Requires-Root: no
|
|
6 |
Build-Depends: debhelper (>= 10),
|
|
7 |
haskell-devscripts-minimal | haskell-devscripts (>= 0.13),
|
|
8 |
cdbs,
|
|
9 |
ghc,
|
|
10 |
ghc-prof,
|
|
11 |
libghc-diff-dev (>= 0.4),
|
|
12 |
libghc-diff-prof (>= 0.4),
|
|
13 |
libghc-ansi-terminal-dev (>= 0.6.2),
|
|
14 |
libghc-ansi-terminal-prof (>= 0.6.2),
|
|
15 |
libghc-base-compat-dev (>= 0.8.2),
|
|
16 |
libghc-base-compat-prof (>= 0.8.2),
|
|
17 |
libghc-optparse-applicative-dev (>= 0.11),
|
|
18 |
libghc-optparse-applicative-prof (>= 0.11),
|
|
19 |
libghc-unix-compat-dev (>= 0.4.2.0),
|
|
20 |
libghc-unix-compat-prof (>= 0.4.2.0),
|
|
21 |
Standards-Version: 4.6.2
|
|
22 |
Homepage: https://github.com/Peaker/git-mediate
|
|
23 |
X-Description: tool to help resolving git conflicts
|
|
24 |
In any conflicted state - git-mediate shows you
|
|
25 |
the 2 diffs involved. By applying these diffs to
|
|
26 |
the base version and the other version, you
|
|
27 |
emulate the situation where the patch had already
|
|
28 |
existed when the other had been applied.
|
|
29 |
.
|
|
30 |
Reapply git-mediate, it will validate that you've
|
|
31 |
indeed applied it correctly, and bam: conflict
|
|
32 |
disappeared!
|
|
33 |
.
|
|
34 |
Git-mediate also lets you handle modify/delete
|
|
35 |
conflicts (there's no sane way in git to show
|
|
36 |
what the modification actually was)
|
|
37 |
.
|
|
38 |
Git-mediate also streamlines jumping to the
|
|
39 |
conflicts with your editor, either with the `-e`
|
|
40 |
option to invoke your editor, or via the standard
|
|
41 |
line number format, which is parsed by all major
|
|
42 |
editors, to allow use of "jump to next error"
|
|
43 |
keys.
|
|
44 |
.
|
|
45 |
Git-mediate especially shines with automatic
|
|
46 |
source transformation tools such as renamers.
|
|
47 |
.
|
|
48 |
In a conflicted state, re-apply a rename that
|
|
49 |
caused the conflict, run git-mediate without
|
|
50 |
opening any files, and the conflicts are gone!
|
|
51 |
|
|
52 |
Package: git-mediate
|
|
53 |
Architecture: any
|
|
54 |
Section: vcs
|
|
55 |
Depends: ${haskell:Depends},
|
|
56 |
${misc:Depends},
|
|
57 |
${shlibs:Depends},
|
|
58 |
Recommends: ${haskell:Recommends},
|
|
59 |
Suggests: ${haskell:Suggests},
|
|
60 |
Conflicts: ${haskell:Conflicts},
|
|
61 |
Provides: ${haskell:Provides},
|
|
62 |
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
|
|
63 |
${haskell:LongDescription}
|
|
64 |
.
|
|
65 |
${haskell:Blurb}
|