Hi, On Tue, 15 May 2007, Jakub Narebski wrote: > You can just do "git cat-file -p :2:filename > filename", then "git add > filename" (or "git update-index filename") to resolve conflict. Do we really want to advertise this obscure-looking plumbing? Wouldn't it be better to teach people to use "git show" instead? I mean, people can get intimidated by that... 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
