Hello all,

I'm trying to perform a merge that my coworker is able to perform on his 
machine.

I'm running 1.8.4.msysgit.0  and he is running 1.8.0.msysgit.0

$ git merge master
error: addinfo_cache failed for path '[redacted for privacy a].xml'
error: addinfo_cache failed for path '[redacted for privacy b].xml'
error: addinfo_cache failed for path '[redacted for privacy c].xml'
error: addinfo_cache failed for path '[redacted for privacy d].xml'
Auto-merging [redacted for privacy 1].xml
Auto-merging [redacted for privacy 2].xml
Auto-merging [redacted for privacy 3].xml
Auto-merging [redacted for privacy 4].xml
Auto-merging [redacted for privacy 5].xml
Auto-merging [redacted for privacy 6].xml
Auto-merging [redacted for privacy 7].xml
Auto-merging [redacted for privacy 8].xml
[redacted for privacy a].xml: unmerged 
(6882faf50b449f1e974855b80d4dbfa22e204d69)
[redacted for privacy a].xml: unmerged 
(75104b8f9c2ea4f0eda02c71a87813b503f2280b)
[redacted for privacy a].xml: unmerged 
(f224ff6130dd41bb070a331642f0bdef70c4be14)
[redacted for privacy b].xml: unmerged 
(3f1d300c470b1f048d5eeff5dd6e2ce4e43110a9)
[redacted for privacy b].xml: unmerged 
(ada96da0fd11445442833359dee147dba66ddc12)
[redacted for privacy b].xml: unmerged 
(f5f39801eff79bd3983ee269d66446c22a81c92f)
[redacted for privacy c].xml: unmerged 
(85d84c7eb2858eb4c3f4438f4dc81726067286bc)
[redacted for privacy c].xml: unmerged 
(c116ee65ccee79917c1d04bd995bd858fc02f8d9)
[redacted for privacy c].xml: unmerged 
(e1a1113b738dc256f61ac6d52c54db60c54858f9)
[redacted for privacy d].xml: unmerged 
(8bef1ddcaab3d6196abcac3da5515a7429cb4193)
...
fatal: git write-tree failed to write a tree

I've double checked that Windows Defender is off, I dont have any virus 
scanner running as that has been a source of pain for us in the past.

What other debugging information can I provide?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to