Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #11106

Bug#914230: ITP: git-imerge -- incremental merge and rebase for git

Cross-posted to 3 groups.

Show key headers only | View raw

Package: wnpp
Severity: wishlist
Owner: James Clarke <jrtc27@debian.org>

* Package name    : git-imerge
  Version         : 1.1.0
  Upstream Author : Michael Haggerty <mhagger@alum.mit.edu>
* URL             : https://github.com/mhagger/git-imerge
* License         : GPLv2+
  Programming Lang: Python
  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.

I recently discovered this useful tool and now use it for my day-to-day
work dealing with forks of large upstream projects. I intend to maintain
this as part of PAPT (which I've just found out is open to all DDs,
though out of courtesy I've still Cc'ed debian-python).

Regards,
James

Back to linux.debian.maint.python | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Bug#914230: ITP: git-imerge -- incremental merge and rebase for git James Clarke <jrtc27@debian.org> - 2018-11-20 20:40 +0100
  Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) James Clarke <jrtc27@debian.org> - 2018-11-22 01:40 +0100
    Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Chris Lamb <lamby@debian.org> - 2018-11-22 10:50 +0100
      Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) James Clarke <jrtc27@debian.org> - 2018-11-22 11:00 +0100
      Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Ondrej Novy <novy@ondrej.org> - 2018-11-22 13:40 +0100
        Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Chris Lamb <lamby@debian.org> - 2018-11-22 14:30 +0100
    Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Ondrej Novy <novy@ondrej.org> - 2018-11-27 16:20 +0100

csiph-web