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?
BE WARNED: This will cancel all modifications you have made that are not on origin branch
git resetreverts your working copy,--hardoption is to tell that you really want to forget everything. This has the exactly same effect than re-cloning from the origin repository.