https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7376
Axelle Aix-Marseille Université <axelle.clari...@univ-amu.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |axelle.clari...@univ-amu.fr --- Comment #74 from Axelle Aix-Marseille Université <axelle.clari...@univ-amu.fr> --- The status was changed from "Patch does'nt apply" to "Needs signoff" today. So I tried on a sandbox but it still not works : The sandbox you've requested is not ready. Some problems occurred applying patches from bug 7376: <h1>Something went wrong !</h1>Applying: Bug 7376 Transfer limits should be checked at check-in Applying: Bug 7376: Refactoring subroutines Using index info to reconstruct a base tree... M C4/Circulation.pm Falling back to patching base and 3-way merge... Auto-merging C4/Circulation.pm CONFLICT (content): Merge conflict in C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 7376: Refactoring subroutines The copy of the patch that failed is found in: .git/rebase-apply/patch 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 7376 - Transfer limits should be checked at check-in 92774 - Bug 7376 Transfer limits should be checked at check-in 93194 - (ANOTHER IMPLEMENTATION) Bug 7376: Refactoring subroutines 93195 - (ANOTHER IMPLEMENTATION) Bug 7376: Fix wrong indentation of CanBookBeReturned 93196 - (ANOTHER IMPLEMENTATION) Bug 7376: Transfer limits should be checked at check-in Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/ANOTHER-IMPLEMENTATION-Bug-7376-Refactoring-subrou-21wcKc.patch . -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/