On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
