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

Include more details when logging GitLabRebaseResultMismatch #336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

perlun
Copy link

@perlun perlun commented Jan 26, 2022

We are seeing this locally for whatever reason, even though we are merging with margebot (e.g. multiple MRs in the same repo), and also in general whenever a branch is not up-to-date (=rebased on master in the main fork) when the MR gets assigned to the Marge-bot user. The aim here is to help to make debugging issues like this easier.

marge-bot_1 | 2022-01-26 07:44:00,676 INFO Gitlab rebase didn't give expected result

marge/single_merge_job.py Outdated Show resolved Hide resolved
@perlun
Copy link
Author

perlun commented Apr 1, 2022

Ping @snim2. Any chance someone could review this within the near future?

@snim2
Copy link
Contributor

snim2 commented Apr 1, 2022

Ping @snim2. Any chance someone could review this within the near future?

I've left you a comment, but I don't have rights to merge anything in this repo BTW!

@perlun perlun force-pushed the fix/log-rebase-result-mismatch-errors branch from 16e332e to 34286d5 Compare April 26, 2022 12:16
@perlun
Copy link
Author

perlun commented Apr 26, 2022

Thanks @snim2, appreciated. 👍 Would @qqshfox be able to give this a look?

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

Successfully merging this pull request may close these issues.

2 participants