Comment by skybrian

This is fine for smaller, low-velocity projects, but tends to result in merge conflicts in high-velocity projects.

An alternative I've seen work well is to put changelog= comments in the patch descriptions and automatically gather them at release time.