Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make rebase for merge proposals a "must" #957

Open
xmkg opened this issue Jul 29, 2024 · 0 comments
Open

Make rebase for merge proposals a "must" #957

xmkg opened this issue Jul 29, 2024 · 0 comments

Comments

@xmkg
Copy link
Contributor

xmkg commented Jul 29, 2024

Right now, merge proposals can be merged to the main if the CI pipeline is green and there are no conflicts with "main". This is problematic if another MP with no conflicts that enforces stricter checks (e.g. new tests, new pylint warnings, etc.) gets merged meanwhile.

The setting that controls this behavior is listed under [Settings]->Branches->main[Edit]->"Require branches to be up to date before merging":
image

xmkg added a commit to xmkg/hotsos that referenced this issue Jul 30, 2024
the ci is failing due to pylint too-many-arguments and duplicate-code warnings.

it's an example for the issue described here: canonical#957

fixed the following:

too-many-arguments: removed svc parameter from the _check_item_settings
as it's already included in the service object.

duplicate-code: suppressed the warning.

Signed-off-by: Mustafa Kemal Gilor <[email protected]>
dosaboy pushed a commit that referenced this issue Jul 30, 2024
the ci is failing due to pylint too-many-arguments and duplicate-code warnings.

it's an example for the issue described here: #957

fixed the following:

too-many-arguments: removed svc parameter from the _check_item_settings
as it's already included in the service object.

duplicate-code: suppressed the warning.

Signed-off-by: Mustafa Kemal Gilor <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant