Hi, On Tue, 3 Mar 2009, Caleb Cushing wrote: > 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... You have a tree with unmerged entries. Why don't you look into the issue and solve it? A simple "git status" should show you what are the unmerged entries. A simple look at those files should show you conflict markers. Resolve the issue, commit, continue. Ciao, Dscho -- 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
