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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
