What could be the best way to keep this work alive ?
I propose to make diff between bootstrap branch and trunk and make a
patch with bootstrap theme and GUI modifications.
It's a manual merge but it could work ;)
What do you think ?
Julien.
Le 18/05/2015 13:05, Jacques Le Roux a écrit :
I tried but got this
Command: Auto-merge https://svn.apache.org/repos/asf/ofbiz/trunk into
C:\projectsASF\boostrap_theme
Error: Reintegrate can only be used if revisions 1634810 through
1679986 were
Error: previously merged from
Error: https://svn.apache.org/repos/asf/ofbiz/branches/boostrap_theme
to the
Error: reintegrate source, but this is not the case:
Error: ofbiz/trunk
Error: Missing ranges:
/ofbiz/branches/boostrap_theme:1634810,1635414,1635439
Gave up
Jacques
Le 18/05/2015 12:39, Pierre Smits a écrit :
Hi all,
Can we have an update on the bootstrap dev branch so that it has the
latest
from trunk?
Best regards,
Pierre Smits
*ORRTIZ.COM <http://www.orrtiz.com>*
Services & Solutions for Cloud-
Based Manufacturing, Professional
Services and Retail & Trade
http://www.orrtiz.com
