CODEWITHSUNDEEP
gitgithub
David542
David542

Reputation: 110163

Easiest way to make local branch = origin branch

I pulled changes, and merged conflicts by accident.

The result: I have a bunch of local files with >>>>>>>>>>>>>HEAD>>>>>>>>, etc.

What is the easiest way to delete my local 'master' branch and 're-clone' the origin 'master' branch back to my repository?

Upvotes: 1

Views: 301

Answers (1)

CharlesB
CharlesB

Reputation: 90316

BE WARNED: This will cancel all modifications you have made that are not on origin branch

git reset --hard origin/master

git reset reverts your working copy, --hard option is to tell that you really want to forget everything. This has the exactly same effect than re-cloning from the origin repository.

Upvotes: 3

Related Questions