[Cc: picca <picca@xxxxxxxxxxxxxxxxxxxxx>, git@xxxxxxxxxxxxxxx] picca wrote: > My question is how can I keep the upstream version of the configure > file instread of the one in the working directory. > > I read about the stage(1:2:3) but I do not know how if it is related to > my problem. You can just do "git cat-file -p :2:filename > filename", then "git add filename" (or "git update-index filename") to resolve conflict. Check first if :2: is correct file (and not for example :3:). -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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
