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