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? Thanks Holger
* Holger Meissner (Holger.Meissner@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
Tell me the bug number. On Wed, Sep 17, 2014 at 2:32 AM, Holger Meissner < Holger.Meissner@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?
Thanks Holger
_______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org 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/
-- Tomás Cohen Arazi Prosecretaría de Informática Universidad Nacional de Córdoba ✆ +54 351 5353750 ext 13168 GPG: B76C 6E7C 2D80 551A C765 E225 0A27 2EA1 B2F3 C15F
participants (3)
-
Chris Cormack -
Holger Meissner -
Tomas Cohen Arazi