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

2020-10-07 Thread Paul Wise
Control: owner !

On Tue, 20 Nov 2018 19:37:49 + Jessica Clarke wrote:

> * Package name: git-imerge
...
>   Description : incremental merge and rebase for git
...
> I recently discovered this useful tool and now use it for my day-to-day
> work dealing with forks of large upstream projects.

It was mentioned on IRC that this is no longer true and mergify was
adopted as a replacement, but I am still using git-imerge so I will
take over the package. Hopefully Jessica will package mergify too :)

https://github.com/brooksdavis/mergify

-- 
bye,
pabs

https://wiki.debian.org/PaulWise


signature.asc
Description: This is a digitally signed message part


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

2018-11-20 Thread James Clarke
Package: wnpp
Severity: wishlist
Owner: James Clarke 

* Package name: git-imerge
  Version : 1.1.0
  Upstream Author : Michael Haggerty 
* 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