Re: [Koha-devel] git koha koha 3.12.00

2013-06-05 Thread Fridolyn SOMERS
There was no conflict in rebase ? Did you get the version from koahversion.pl or from about page ? What gives : git show-branch HEAD v3.12.00 Regards, Le 21/05/2013 14:41, Tomas Cohen Arazi a écrit : tomas@zoe:~/Work/PSI/Koha/koha-community-src$ git checkout v3.12.00 -b 3.12 Switched to a new

Re: [Koha-devel] git koha koha 3.12.00

2013-06-05 Thread Samuel Desseaux
All is ok now. I use v3.12.00 Regards, Le 05/06/2013 10:36, Fridolyn SOMERS a écrit : There was no conflict in rebase ? Did you get the version from koahversion.pl or from about page ? What gives : git show-branch HEAD v3.12.00 Regards, Le 21/05/2013 14:41, Tomas Cohen Arazi a écrit :

[Koha-devel] git koha koha 3.12.00

2013-05-21 Thread Samuel Desseaux
hi, i've a git question: I've made a git remote update and a git rebase v3.12.00 on my test instance but i keep the same version( 3.11.00.203), An idea? Best regards, Samuel ___ Koha-devel mailing list Koha-devel@lists.koha-community.org

Re: [Koha-devel] git koha koha 3.12.00

2013-05-21 Thread Tomas Cohen Arazi
tomas@zoe:~/Work/PSI/Koha/koha-community-src$ git checkout v3.12.00 -b 3.12 Switched to a new branch '3.12' tomas@zoe:~/Work/PSI/Koha/koha-community-src$ grep our kohaversion.pl our $VERSION = '3.12.00.000'; tomas@zoe:~/Work/PSI/Koha/koha-community-src$ Regards To+ On Tue, May 21, 2013 at