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

[Zeno Tajoli]

Hi to all,

from last 3 april 2008 I have a local copy of last version using git.
I have done: git clone git://git.koha.org/home/pub/scm/koha.git kohaclone
then every day: cd ../kohaclone
                         git pull
and I have received the updates.
But today I see:
tajoli at PCTAJOLI ~/Documenti/koha/kohaclone
$ git pull
remote: Generating pack...?[K
remote: Done counting 1090 objects.?[K
remote: Result has 886 objects.?[K
remote: Deltifying 886 objects...?[K
remote:  100% (886/886) done?[K
remote: Total 886 (delta 624), reused 435 (delta 302)?[K
Receiving objects: 100% (886/886), 237.65 KiB | 221 KiB/s, done.
Resolving deltas: 100% (624/624), completed with 182 local objects.
 From git://git.koha.org/pub/scm/koha
    bd30b60..0f8910e  master     -> origin/master
Updating bd30b60..0f8910e
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.

Is there any problem about KohaGit ?
Is there any news about configuration of git ?

Thank you very much
Zeno Tajoli

Zeno Tajoli
CILEA - Segrate (MI)
tajoliAT_SPAM_no_prendiATcilea.it
(Indirizzo mascherato anti-spam; sostituisci quanto tra AT con @)