From: Bill Lear Date: Thu, 05 Apr 2007 13:36:09 GMT Subject: 'git checkout -f' versus 'git reset --hard' Message-ID: <17940.64329.10165.993967@lisa.zopyra.com> After a failed merge, I want to undo things. I typically use git reset --hard, and it works like a charm. Others have tried to use git checkout -f, but I have cautioned that git reset --hard is really the way to do it. Is there a difference here, or are they equivalent? Bill