From: Alec Clews <alecclews@gmail.com>
Date: Wed, 28 Jan 2009 23:31:30 GMT
Subject: Re: How to install and use a custom merge driver
Message-ID: <loom.20090128T232911-174@post.gmane.org>
In-Reply-To: <loom.20090128T230123-889@post.gmane.org>

Alec Clews <alecclews <at> gmail.com> writes:

> Is there someway to enable logging to see how git is making this choice?


Found the answer to my question.

GIT_MERGE_VERBOSITY=5
GIT_TRACE=true


Which results in

+ git merge --stat del2
trace: built-in: git 'merge' '--stat' 'del2'
Merging:
38f3eb9 Accepting delivery del1
virtual del2
found 1 common ancestor(s):
af9dc93 Creating empty staging repo
Auto-merging src/main.c
CONFLICT (add/add): Merge conflict in src/main.c
Automatic merge failed; fix conflicts and then commit the result.


So I'm none the wiser :-(. Any suggestions from wiser people than I?

Thanks

-Alec