* Holger Meissner ([email protected]) 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
signature.asc
Description: Digital signature
_______________________________________________ Koha-devel mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
