[Development] ChangeLogs

Tor Arne Vestbø tor.arne.vestbo at digia.com
Mon Jan 21 17:02:10 CET 2013


On 1/21/13 16:37 , Giuseppe D'Angelo wrote:
> On 21 January 2013 15:08, Tor Arne Vestbø <tor.arne.vestbo at digia.com> wrote:
>> If you're writing the ChangeLog entry at commit time, not right before
>> the release, why can't your patch contain a change to dist/changelog
>> from the get-go which, can be reviewed and integrated along with the
>> code change?
>
> Because that usually causes silly conflicts when staging (=>merging)
> the patch. :(

That can be solved by a git merge-driver for the changelog format.

tor arne




More information about the Development mailing list