git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to install and use a custom merge driver

From
Alec Clews <alecclews@gmail.com>
Date
Jan 28, 2009, 23:31 UTC
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
Previous: Alec ClewsNext: Jeff King
Message 4 of 9 in “How to install and use a custom merge driver”
  1. Alec ClewsJan 28, 2009
  2. Jeff KingJan 28, 2009
  3. Alec ClewsJan 28, 2009
  4. Alec ClewsJan 28, 2009
  5. Jeff KingJan 29, 2009
  6. Alec ClewsJan 29, 2009
  7. Jeff KingJan 29, 2009
  8. Alec ClewsJan 29, 2009
  9. Jeff KingJan 29, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.