On segunda-feira, 21 de janeiro de 2013 17.02.10, Tor Arne Vestbø wrote: > On 1/21/13 16:37 , Giuseppe D'Angelo wrote: > > On 21 January 2013 15:08, Tor Arne Vestbø <[email protected]> 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.
Note: the merging is done by Gerrit. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
