[Koha-bugs] [Bug 21757] Patron detail script (moremember.pl) cleanup

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

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

Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |severine.queune at bulac.fr

--- Comment #2 from Séverine Queune <severine.queune at bulac.fr> ---
Hi Josef, 
Here is the mail I've just received :

The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 21757:
<h1>Something went wrong !</h1>Applying: Bug 21757: Clenup of moremember.pl and
its templates
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
M       members/moremember.pl
Falling back to patching base and 3-way merge...
Auto-merging members/moremember.pl
CONFLICT (content): Merge conflict in members/moremember.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
CONFLICT (modify/delete):
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt deleted in
Bug 21757: Clenup of moremember.pl and its templates and modified in
6533f32c3a7acdaaa6769e6039472045add847e2. Version
6533f32c3a7acdaaa6769e6039472045add847e2 of
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt left in
tree.
Removing koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21757: Clenup of moremember.pl and its templates
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 21757 - Patron detail script (moremember.pl) cleanup

81916 - Bug 21757: Clenup of moremember.pl and its templates

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-21757-Clenup-of-morememberpl-and-its-templates-ZONSXB.patch .

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