[Koha-devel] a problem with configuration of git ?

[Paul POULAIN]

Zeno Tajoli a écrit :
> koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl: needs update
> fatal: Entry 
> 'koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl' not upto
> date. Cannot merge.

It means you have modified opac-dictionary.tmpl locally, and git don't 
want/can't to pull/rebase until you're commited (or discarded) the 
changes you did.
-- 
Paul POULAIN
http://www.biblibre.com
Expert en Logiciels Libres pour l'info-doc
Tel : 04 91 31 45 19