[Conkeror] Development now occurring in the master branch of the git repository

[Brian May]

>>>>> "Jeremy" == Jeremy Maitin-Shepard <jeremy at jeremyms.com> writes:

    Jeremy> git fetch
    Jeremy> git checkout master
    Jeremy> git merge origin


I get:

Automatic merge failed; fix conflicts and then commit the result.

I haven't made any changes.

How do I delete all local changes and get the latest version?
-- 
Brian May <bam at snoopy.apana.org.au>