title: GIT Customer Merge Driver Problems(Windows msysgit 1.9.0)
body: <p>In Git we store the data from a database.  A custom .Net application was created to store this data in text files(One for each table).  This worked OK, however as more users joined the team we were getting to many merge conflicts.</p>
  
  <p>To get around this problem I am trying to get a custom Merge Driver developed to replace Git’s inbuilt Merge Driver.  I have tested the application and it works as expected when used from the command line.  However when I integrate this into Git I am getting this error.</p>
  
  <pre><code>$ git pull
  First, rewinding head to replay your work on top of it...
  Applying: test
  Using index info to reconstruct a base tree...
  M       FocalPoint/Data/OBV_USERS.TXT
  Falling back to patching base and 3-way merge...
  *PKEY Added[&lt;USR_ID&gt;PRJ8&lt;/USR_ID&gt;] - In Both Kept Yours
  *OBVDataMerge Mods[1] Ads[0] Dels [0]
  error: addinfo_cache failed for path 'FocalPoint/Data/OBV_USERS.TXT'
  Auto-merging FocalPoint/Data/OBV_USERS.TXT
  FocalPoint/Data/OBV_USERS.TXT: unmerged (d9985c8288b16fb072c314e7aa68401ac5c30491)
  FocalPoint/Data/OBV_USERS.TXT: unmerged (f18085d169223241c2f70a12bbdea7dc879d5bbf)
  FocalPoint/Data/OBV_USERS.TXT: unmerged (af1e6a12f0d7fab318dba4be5317644595ef8745)
  fatal: git-write-tree: error building trees
  </code></pre>
  
  <p>The lines prefixed with * are just comments my application makes.</p>
  
  <p>After this has completed the “FocalPoint/Data/OBV_USERS.TXT” has been correctly merged(My program worked as expected), however the repository is still in a REBASE state.</p>
  
  <p>This is my Git Configuration File:</p>
  
  <pre><code>[merge "OBVData"] 
      name = OBVData Custom Merge
      driver = "DataMergeDriver.exe" %A %O %B
      recursive = binary
  </code></pre>
  
  <p>This is the attributes file on the Directory the data needing to use this merge method.</p>
  
  <pre><code>* merge=OBVData
  </code></pre>
  
  <p>My Application will just use the A O and B files to work out how to update the A file.  This A file is then the contents of the FocalPoint/Data/OBV_USERS.TXT after the pull process completes.</p>
  
  <p>I have tried every combination I can think of to fix this problem,  however I am at loss what the problem is.</p>