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

[Daniel Hengeveld]

Try a:

git reset --hard

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

On Jan 18, 2008, at 12:56 AM, Brian May wrote:

>>>>>> "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>
> _______________________________________________
> Conkeror mailing list
> Conkeror at mozdev.org
> https://www.mozdev.org/mailman/listinfo/conkeror

..[daniel hengeveld]..
neoglam.com