On 04/26/2012 09:14 AM, Stefano Lattarini wrote: > Now that we only have 'master' and 'maint' as long-lived branches > (ok, there's 'ng/master' as well, but there we have a separated > file 'NG-NEWS'), the NEWS changes should merge and sync easily and > cleanly. > > So I wish to take back my proposed patch, and substitute it with > a trivial patch that just edit '.gitattributes' not to specify the > "union" merge driver for NEWS anymore. > > WDYT?
It's your call as maintainer, for whatever you think will be easiest to maintain over long-term merges; if our new branching policy makes it possible to enforce good NEWS entries across both branches, then simpler is reasonable. -- Eric Blake ebl...@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
