On 2008/05/21, at 3:00 AM, Zeno Tajoli wrote: > 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' ?
hi Zeno try 'git checkout -f' and have a look at these links for some good git info... http://www.kernel.org/pub/software/scm/git/docs/tutorial.html http://www.kernel.org/pub/software/scm/git/docs/core-tutorial.html http://linux.yyz.us/git-howto.html _______________________________________________ Koha-devel mailing list Koha-devel@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-devel
