1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
Source: git-imerge
Section: vcs
Priority: optional
Maintainer: Paul Wise <pabs@debian.org>
Build-Depends:
bash-completion,
debhelper-compat (= 13),
dh-sequence-python3,
git <!nocheck>,
pkg-config,
python3,
python3-setuptools,
python3-wheel <!nocheck>,
tox <!nocheck>,
Standards-Version: 4.6.2
Rules-Requires-Root: no
Testsuite: autopkgtest-pkg-pybuild
Homepage: https://github.com/mhagger/git-imerge
Package: git-imerge
Architecture: all
Multi-Arch: foreign
Depends:
git,
python3,
${misc:Depends},
${python3:Depends},
Suggests:
git-mergify-rebase,
mergify,
Description: incremental merge and rebase for git
Performs a merge between two branches incrementally. If conflicts are
encountered, figures out exactly which pairs of commits conflict, and
presents the user with one pairwise conflict at a time for resolution.
|
