On 02/13/2012 10:45 AM, Stefano Lattarini wrote: > On 02/13/2012 04:47 PM, Peter Rosin wrote: >> >> I have pushed the following as obvious: >> >> From: Peter Rosin <p...@lysator.liu.se> >> Date: Mon, 13 Feb 2012 16:43:34 +0100 >> Subject: [PATCH] fixup: remove double news entry >> >> * NEWS: Remove double (stale) news entry introduced by a botched >> merge. >> > Thanks. > > And I think it is now time to find a format for the list of user-visible > changes that is more merge-friendly than a monolithic NEWS file ... > > Suggestions?
Per 'man gitattributes', git understands a 'union' merge driver, which takes lines from both versions of a file rather than leaving conflict markers (the way the default text merge driver behaves). It may not leave the merged items in any particular order, but would certainly be easier to review, since by default, all NEWS merges should take all entries from both branches. Or maybe it's time to write a custom merge driver for NEWS, similar to the custom merge file for ChangeLog? -- Eric Blake ebl...@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
