a problem with configuration of git ?
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@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 @)
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
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 @)
Hi, On Tue, May 20, 2008 at 10:00 AM, Zeno Tajoli <tajoli@cilea.it> wrote:
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' ?
Yes: git checkout name_of_modified_file will discard the local changes. Regards, Galen -- Galen Charlton Koha Application Developer LibLime galen.charlton@liblime.com p: 1-888-564-2457 x709
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
Also a neat tool is git-stash, for when you are in the situation and you think you might want your changes in the future even if you don't know http://www.kernel.org/pub/software/scm/git/docs/git-stash.html Chris On Wed, May 21, 2008 at 5:15 AM, Mason James <mason.loves.sushi@gmail.com> wrote:
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
participants (5)
-
Chris Cormack -
Galen Charlton -
Mason James -
Paul POULAIN -
Zeno Tajoli