<david.hagood <at> gmail.com> writes: > Error: Entry "Some file name" not uptodate: cannot merge. > > We've tried "git reset --hard; git pull ." We've tried "git reset --hard; > git checkout -f master". Neither seems to fix this. http://article.gmane.org/gmane.comp.version-control.git/122862 -- 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