On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > A tree cannot contain unmerged files. so... still looking for a solution since it seems I can no longer do a merge from this remote. There has to be a way to get the tree back into a proper state... -- 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
