https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19164 Hugo Agud <hagud@orex.es> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |hagud@orex.es --- Comment #9 from Hugo Agud <hagud@orex.es> --- Applying: First cut at some changes to misc/stage_file.pl script to provide for MARC modification template support. Not ready for QA yet. Using index info to reconstruct a base tree... M misc/stage_file.pl Falling back to patching base and 3-way merge... Auto-merging misc/stage_file.pl CONFLICT (content): Merge conflict in misc/stage_file.pl Failed to merge in the changes. Patch failed at 0001 First cut at some changes to misc/stage_file.pl script to provide for MARC modification template support. Not ready for QA yet. 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/First-cut-at-some-changes-to-miscstagefilepl-scrip-x5L2A_.patch -- You are receiving this mail because: You are watching all bug changes.