[Koha-bugs] [Bug 11879] Add a new borrower field : main contact method.

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

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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |alexbuckley at catalyst.net.nz

--- Comment #91 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi Philippe

Sorry but when applying your patch I got the following merge errors (see
below), the issues are in moremember.tt and moremember.pl. Can you please
rebase against master and then I will be more than happy to test again:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11879: Add the "Main contact method" field in borrower
informations.
Using index info to reconstruct a base tree...
M       installer/data/mysql/kohastructure.sql
M       installer/data/mysql/updatedatabase.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
M       members/memberentry.pl
M       members/moremember.pl
M       opac/opac-memberentry.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-memberentry.pl
Auto-merging members/moremember.pl
CONFLICT (content): Merge conflict in members/moremember.pl
Auto-merging members/memberentry.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
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
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 11879: Add the "Main contact method" field in borrower
informations.
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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".
Patch left in
/tmp/Bug-11879-Add-the-Main-contact-method-field-in-bor-uOjbTv.patch

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