[Koha-bugs] [Bug 6413] Notes in Fines doing wonky things
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Apr 11 23:07:42 CEST 2012
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6413
--- Comment #13 from Chris Cormack <chris at bigballofwax.co.nz> ---
Did you remember to try applying it with a 3 way merge
git bz is cool, but without the patch from paul, it doesnt try to merge.
git am --abort
git am -iu3
/tmp/Added-ability-to-add-notes-when-paying-or-writing--E9jlEe.patch
Found out it was a tiny conflict because of the capitalisation change, in one
file. Fixed that, reattached.
But if git bz fails, please try git am -iu3 before marking does not apply, if
that still fails, then that's fine. But a lot of the times it passes
--
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.
More information about the Koha-bugs
mailing list