Thread (6 messages) flat view 6 messages, 2 authors, 2016-06-15

Re: fatal: git write-tree failed to write a tree

From: Caleb Cushing <hidden>
Date: 2016-06-15 22:46:18

On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin
[off-list ref] wrote:
A tree cannot contain unmerged files.
I didn't do that, git did. I've tried running git reset --hard HEAD
(and git status shows a clean tree before hand).

so how can I resolve it?

-- 
Caleb Cushing

http://xenoterracide.blogspot.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help