Re: git: avoiding merges, rebasing

[Benoit SIGOURE]

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

it should be

conflicts

possible to create a custom [merge "cl-merge"] in your git config file, which points to a script designed specifically for resolving changelog

resolution at the top of ChangeLog.

I would love such a script, instead of constantly having to do conflict

--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory

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.

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