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

[Brian May]

>>>>> "Daniel" == Daniel Hengeveld <daniel at zedh.com> writes:

    Daniel> Try a:
    Daniel> git reset --hard

Seems to work.

    Daniel> before the merge - maybe the build and install process alters the
    Daniel> files in some way that causes a conflict. reset --hard will force the
    Daniel> working copy back to the state of its last commit, which should let
    Daniel> you merge cleanly.

I don't think this was the case. Seems weird. Maybe sometime I will
have to learn how git works ;-).
-- 
Brian May <bam at snoopy.apana.org.au>