[horde] Horde can not be updated with git

[Ralf Lang]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>> Pull is not possible because you have unmerged files. Please, fix
>> them up in the work tree, and then use 'git add/rm <file>' as
>> appropriate to mark resolution, or use 'git commit -a'.
>> 
>> Now my horde installation is corrupt, can't login any more.
>> 
>> Any help to get the update running would be appreciated, I do
>> not understand what "fix them up in the work tree" mean, or why
>> the message is comming.
>> 
>> 
>> 
>> Regards, Michael
> 
> There must have been some local changes. To reset to the upstream
> state, just run: git checkout .

Apart from what Jan said about your current problem, sometimes you
need to re-run the framework/bin/horde_dev script after a git update.
And don't forget to prune the Autoloader Cache or you will experience
all sorts of difficulties.

- -- 
Ralf Lang
Linux Consultant / Developer
Tel.: +49-170-6381563
Mail: lang at b1-systems.de
B1 Systems GmbH
Osterfeldstraße 7 / 85088 Vohburg / http://www.b1-systems.de
GF: Ralph Dehner / Unternehmenssitz: Vohburg / AG: Ingolstadt,HRB 3537
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iEYEARECAAYFAlDv8h4ACgkQCs1dsHJ/X7CP+QCgsgUq3kdButuBn8UU+iTFlt1x
wH4An2zlMID4UVJ63uAUelj7Mo8LMtyH
=lphN
-----END PGP SIGNATURE-----