[PATCH] contrib/nmbug: use "resolve" merge strategy

On Sat, Mar 31 2012, david at tethera.net wrote: > From: David Bremner > > The recursive merge strategy does rename detection, which yields false > positives (and hence spurious merge conflicts) when merging trees of > empty files. I attempted to search more info about 'recursive' vs 'resolve'

Re: [PATCH] contrib/nmbug: use resolve merge strategy

On Sat, Mar 31 2012, da...@tethera.net wrote: From: David Bremner brem...@debian.org The recursive merge strategy does rename detection, which yields false positives (and hence spurious merge conflicts) when merging trees of empty files. I attempted to search more info about 'recursive' vs

[PATCH] contrib/nmbug: use "resolve" merge strategy

From: David Bremner The recursive merge strategy does rename detection, which yields false positives (and hence spurious merge conflicts) when merging trees of empty files. --- An unresolved issue (ho ho) is the fact that failed merge operations are still not detected. This