[Bug 12365] Notes for rules

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Bug 12365] Notes for rules

bugzilla-daemon
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12365

Lisette Scheer <[hidden email]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #29 from Lisette Scheer <[hidden email]> ---
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
merge:
       
installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl
Please move or remove them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Bug 12365: Notes for rules
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-12365-Notes-for-rules-Ei3222.patch

Lisette

--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[hidden email]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/