bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git: avoiding merges, rebasing


From: Bruno Haible
Subject: Re: git: avoiding merges, rebasing
Date: Sun, 30 Sep 2007 21:41:25 +0200
User-agent: KMail/1.5.4

> 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.

Bruno





reply via email to

[Prev in Thread] Current Thread [Next in Thread]