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

[Zeno Tajoli]

Hi,

At 09.36 20/05/2008, Paul POULAIN wrote:
>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.

thank you for the information.
In fact I want to discard the changes, can I do this operation with git ?
Is there a command like 'git discard' ?

Bye
Zeno Tajoli



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