[Development] [Releasing] Change file process & improvement proposal

Tor Arne Vestbø tor.arne.vestbo at qt.io
Mon Feb 13 12:11:56 CET 2017


On 13/02/2017 11:02, Edward Welbourne wrote:
> Note that this speaks of "a changelog file" rather than tags in commits;
> I do think this is a better approach, although I do also exhort everyone
> to keep your changelog files organised on some *other* model than "make
> each addition at the end" - e.g. sort by category, like the existing
> ChangeLog tags, and put related changes near each other - since any
> model that makes all additions at the same place *will* get conflicts
> all the time.  Anything to ensure contemporary changes happen in
> different places is better than always conflicting.

Git merge-drivers can be specified on a per file (pattern) basis, so a 
custom changelog driver could be used. We had something similar in 
WebKit for ChangeLog files.

tor arne




More information about the Development mailing list