Re: Stacked GIT 0.3 (now more Quilt-like)

From

Horst von Brand <vonbrand@inf.utfsm.cl>

Date

Jul 4, 2005, 01:10 UTC

Message-ID

<200507040110.j641AiYl004190@laptop11.inf.utfsm.cl>

In-Reply-To

<catalin.marinas@gmail.com>

Catalin Marinas <catalin.marinas@gmail.com> wrote:

> On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote:
> > Catalin Marinas <catalin.marinas@gmail.com> writes:
> > > I know that using -A gives a more detailed output in case of a conflict.
> > > The problem is that you will get a conflict even if the changes are
> > > identical, making it impossible to detect when a patch was merged
> > > upstream.

> > OK, I see. How about using wiggle instead?
> > 
> >         http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/

[...]

> I haven't used wiggle before but I will give it a try (though I prefer
> such a tool not to be too smart since it might make mistakes).

-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513