[Koha-bugs] [Bug 21979] Add option to SIP2 config to send arbitrary item field in CR instead of collection code

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #11 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch no longer applies, please rebase!

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 21979: Add option to SIP2 config to send arbitrary item field in
CR instead of collection code
Using index info to reconstruct a base tree...
M       C4/SIP/ILS/Item.pm
M       C4/SIP/Sip/MsgType.pm
M       etc/SIPconfig.xml
Falling back to patching base and 3-way merge...
Auto-merging etc/SIPconfig.xml
Auto-merging C4/SIP/Sip/MsgType.pm
Auto-merging C4/SIP/ILS/Item.pm
CONFLICT (content): Merge conflict in C4/SIP/ILS/Item.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21979: Add option to SIP2 config to send arbitrary
item field in CR instead of collection code
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".
Patch left in
/tmp/Bug-21979-Add-option-to-SIP2-config-to-send-arbitr-uD5jqS.patch


I have some issues setting up SIP on my kohadevbox - looking for a tutor!

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