On Sat, Aug 25, 2007 at 07:37:47AM -0400, David Watson wrote: > $ git reset --hard origin/master Ah, this is what I was looking for. Not very intuitive, but works like a charm! > You may be getting the "cannot merge message" if you have uncommitted > changes, as git won't let you merge when the working copy is changed. > git-pull is really git-fetch + git-merge. Right, because I used "--soft" in the earlier reset. Thanks! -- Jing Xue - 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
