http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11311 --- Comment #7 from fpichenot@ville-roubaix.fr --- Installation failed on sandbox : The sandbox you've requested is not ready. Some problems occurred applying patches from bug 10858 11311: <h1>Something went wrong !</h1>Applying: Bug 10858: Browse selected biblios Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl CONFLICT (content): Merge conflict in opac/opac-detail.pl CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc left in tree. Failed to merge in the changes. Patch failed at 0001 Bug 10858: Browse selected biblios When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 10858 - Browse selected biblios 25643 - Bug 10858: Browse selected biblios 25644 - Bug 10858 [Follow-up] Browse selected biblios 25645 - Bug 10858: FIX error if no biblio is selected 25646 - Bug 10858: Don't use the cookie if the ft is disabled 25647 - Bug 10858: Browse selected biblios - bootstrap 25648 - Bug 10858: FIX the Browse selected link 25649 - Bug 10858: FIX Only one occurrence of the biblionumbers should be stored 25650 - Bug 10858: Replace Browse results with Browse selected results 25651 - Bug 10858: fix bad merge conflict 25652 - Bug 10858: follow-up Don't use the cookie if the ft is disabled 25653 - Bug 10858: Handle JS deactivated and cookies disabled Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-10858-Browse-selected-biblios-_uhkSZ.patch . sandbox is not ready ! Admin User Koha Jeudi 05 Mars 2015 10:04 A : fpichenot@ville-roubaix.fr Afficher les détails The sandbox you've requested is not ready. Some problems occurred applying patches from bug 10858 11311: <h1>Something went wrong !</h1>Applying: Bug 10858: Browse selected biblios Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl CONFLICT (content): Merge conflict in opac/opac-detail.pl CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc deleted in HEAD and modified in Bug 10858: Browse selected biblios. Version Bug 10858: Browse selected biblios of koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc left in tree. Failed to merge in the changes. Patch failed at 0001 Bug 10858: Browse selected biblios When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 10858 - Browse selected biblios 25643 - Bug 10858: Browse selected biblios 25644 - Bug 10858 [Follow-up] Browse selected biblios 25645 - Bug 10858: FIX error if no biblio is selected 25646 - Bug 10858: Don't use the cookie if the ft is disabled 25647 - Bug 10858: Browse selected biblios - bootstrap 25648 - Bug 10858: FIX the Browse selected link 25649 - Bug 10858: FIX Only one occurrence of the biblionumbers should be stored 25650 - Bug 10858: Replace Browse results with Browse selected results 25651 - Bug 10858: fix bad merge conflict 25652 - Bug 10858: follow-up Don't use the cookie if the ft is disabled 25653 - Bug 10858: Handle JS deactivated and cookies disabled -- You are receiving this mail because: You are watching all bug changes.