> > 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. no... not so simple... git mergetool comes back with (c)reated (d)eleted files. I want the created one. when I choose that and commit, no merge is capable of happening. it says (for that file) that there is nothing to change, in fact if nothing else has changed the branch will simply say nothing to commit once I've resolved it. all commits at this point are simply commits. -- 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
