[Koha-devel] Rebase after passing QA?

[Chris Cormack]

* Holger Meissner (Holger.Meissner at hs-gesundheit.de) wrote:
> Dear Koha devs,
> 
> a few weeks ago one of my patches passed QA. By now it doesn't auto-merge with master anymore. I suspect the conflicts can be resolved without too much trouble. Should I rebase, keeping the Passed QA status? Or should I rebase and set back to Signed Off? Or leave it to the RM to rebase?
> 

Id rebase it, and if it is only a tiny conflict, leave it as passed qa, if its a big one, then
I'd ask Tomas what he would like you to do. 

Chris
-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.koha-community.org/pipermail/koha-devel/attachments/20140917/11a8e852/attachment.pgp>