On 5/16/07, Johannes Schindelin 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
I could be wrong, but git-show works in this way only after version 1.5, right ? As far as I can tell, using git-1.4.4.4 or ealier, you would still need git-cat-file -p... to fix this merge conflict. -- Christian - 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
