Re: git: avoiding merges, rebasing

[Benoit SIGOURE]

On Sep 30, 2007, at 9:41 PM, Bruno Haible wrote:

> > it should be
> > possible to create a custom [merge "cl-merge"] in your git config  
> > file,
> > which points to a script designed specifically for resolving  
> > changelog
> > conflicts
>
> I would love such a script, instead of constantly having to do  
> conflict
> resolution at the top of ChangeLog.

So would I.  I've had this in my TODO list for a long time so if no  
one else is willing to give it a try, I can try, but it won't be  
before next week because my schedule is quite busy until then.

--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory

PGP.sig
Description: This is a digitally signed message part