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

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

Date: Sat, 31 Mar 2012 09:12:40 -0300

To: notmuch@notmuchmail.org

Cc: David Bremner

From: david@tethera.net

From: David Bremner <bremner@debian.org>

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 needs more thought, but I thought this 
 patch might save people some pain in the meantime. It isn't very heavily 
 tested, though.

 contrib/nmbug |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/nmbug b/contrib/nmbug
index bb0739f..0ed3c29 100755
--- a/contrib/nmbug
+++ b/contrib/nmbug
@@ -302,7 +302,7 @@ sub do_merge {
 
   git ( { GIT_WORK_TREE => $tempwork }, 'checkout', '-f', 'HEAD');
 
-  git ( { GIT_WORK_TREE => $tempwork }, 'merge', 'FETCH_HEAD');
+  git ( { GIT_WORK_TREE => $tempwork }, 'merge', '-s', 'resolve', 'FETCH_HEAD');
 
   do_checkout ();
 }
-- 
1.7.9.1

Thread: