On 05/04/12 10:53, Daniel Friesen wrote:
Firstly: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-chan...
A git merge that seams to understand how to intelligently merge some types of changelog files. I thought this might be problematic to have everyone install. But thinking about it again. Gerrit is the one doing merges. If that can handle the RELEASE-NOTES format that we uses. Then theoretically installing it on the server gerrit uses and then configuring our release notes to use it could theoretically make Gerrit suddenly able to handle RELEASE-NOTES changes without conflicts.
I like it.