[Koha-bugs] [Bug 18661] Make "Replace only included patron attributes" default on patron import

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18661

jmbroust <jean-manuel.broust at univ-lyon2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jean-manuel.broust at univ-lyo
                   |                            |n2.fr
             Status|Needs Signoff               |Failed QA

--- Comment #2 from jmbroust <jean-manuel.broust at univ-lyon2.fr> ---
Problem on sandbox 8. Not tested.
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 18661:
<h1>Something went wrong !</h1>Applying: Made Replace only included patron
attributes default on patron import
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
error: Failed to merge in the changes.
Patch failed at 0001 Made Replace only included patron attributes default on
patron import
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 18661 - Make Replace only included patron attributes default on patron
import

70572 - Made Replace only included patron attributes default on patron import

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
tmpMade-Replace-only-included-patron-attributes-defau-C0CswV.patch .

-- 
You are receiving this mail because:
You are watching all bug changes.