[Koha-bugs] [Bug 23695] Items holdingbranch should be set to the originating library when generating a manual transfer

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

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

Lisette Scheer <lisetteslatah at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |lisetteslatah at gmail.com

--- Comment #4 from Lisette Scheer <lisetteslatah at gmail.com> ---
Applying: Bug 23695: Set holding branch to transferring branch when manually
initiating a transfer
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       circ/branchtransfers.pl
M       t/db_dependent/Circulation.t
M       t/db_dependent/Koha/Items.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Items.t
Auto-merging t/db_dependent/Circulation.t
CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t
Auto-merging circ/branchtransfers.pl
Auto-merging C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23695: Set holding branch to transferring branch when
manually initiating a transfer
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"

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