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
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 9:02 AM, Samuel Desseaux <samuel.desseaux@ecp.fr>wrote:
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<Koha-devel@lists.koha-community.org> http://lists.koha-community.**org/cgi-bin/mailman/listinfo/**koha-devel<http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel> website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.**org/ <http://bugs.koha-community.org/>
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 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 9:02 AM, Samuel Desseaux <samuel.desseaux@ecp.fr>wrote:
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<Koha-devel@lists.koha-community.org> http://lists.koha-community.**org/cgi-bin/mailman/listinfo/**koha-devel<http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel> website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.**org/ <http://bugs.koha-community.org/>
_______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
-- Fridolyn SOMERS Biblibre - Pôle support fridolyn.somers@biblibre.com
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 :
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 9:02 AM, Samuel Desseaux <samuel.desseaux@ecp.fr>wrote:
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<Koha-devel@lists.koha-community.org>
website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.**org/ <http://bugs.koha-community.org/>
_______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
participants (3)
-
Fridolyn SOMERS -
Samuel Desseaux -
Tomas Cohen Arazi