tags:

views:

78

answers:

2

I dont' want to deal with any conflicts on my local master branch as the origin (remote) master has changed and I just want 100% of the remote's version.

Is there a way to wipe out the local master? (other than just manually deleting and cloning again).

+4  A: 

When on branch 'master', you can simply do

git reset --hard origin/master

Note that you would lose your local changes that way.

Jakub Narębski
+4  A: 

Here's how I would do it (while on master):

git fetch origin
git reset --hard origin/master

As evidenced by the other answers, there's more than one way to get this done. Somehow, to me this just seems the most straightforward.

EDIT: Where'd all the other answers go??

Dan Moulding