http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7090
Paul Poulain <paul.poul...@biblibre.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Passed QA |Pushed to Master
--- Comment #9 from Paul Poulain <paul.poul...@biblibre.com> 2012-02-10
18:48:00 UTC ---
Well, found a QA comment to do = there was a tab instead of 4 spaces in the
updatedatabase. I've fixed it before pushing, as there's the DBrev number to
push.
Srdjan, about your comment:
> Sorry, I'm not familiar with the procedure, do you need me to rebase it now?
When a patch does not apply, the author of the patch is supposed to deal with
the rebase.
There is an exception to this rule: a conflict on updatedatabase can usually be
solved easily by the sign-offer, the QAer or the RM, as it's a very common
problem. that's why i've fixed it (and it was trivial : your syspref was added
at the end of the syspref file, and another patch already had added another
line. Just tell git that both lines must be added
(vi sysprefs.sql, remove <<<, ==== and >>> lines, git add sysprefs.sql;git am
--resolved, and you're done)
--
Configure bugmail:
http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/
