[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

Bouzid Fergani <bouzid.fergani at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bouzid.fergani at inlibro.com

--- Comment #6 from Bouzid Fergani <bouzid.fergani at inlibro.com> ---
Hi Kyle,
We have conflict in etc/SIPconfig.xml when applying.

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

93535 - Works as expected. Thanks.

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       etc/SIPconfig.xml
Falling back to patching base and 3-way merge...
Auto-merging etc/SIPconfig.xml
CONFLICT (content): Merge conflict in etc/SIPconfig.xml
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/Works-as-expected-Thanks-ELLAUG.patch

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