mirror of
https://github.com/odoo/runbot.git
synced 2025-03-15 23:45:44 +07:00
20a4e97b05
Because of the false negatives due to github's reordering of events on retargeting, blocking merge methods can be rather frustrating or the user as what's happening and how to solve it isn't clear in that case. Keep the warnings and all, but remove the blocking factor: if a PR doesn't have a merge method and is not single-commit, just skip it on staging. This way, PRs which are actually single-commit will stage fine even if the mergebot thinks they shouldn't be. Fixes #957
12 lines
193 B
Python
12 lines
193 B
Python
class MergeError(Exception):
|
|
pass
|
|
class FastForwardError(Exception):
|
|
pass
|
|
class Mismatch(MergeError):
|
|
pass
|
|
class Unmergeable(MergeError):
|
|
pass
|
|
|
|
class Skip(MergeError):
|
|
pass
|