Skip to content

Include more details when logging GitLabRebaseResultMismatch - #336

Open
perlun wants to merge 1 commit into
smarkets:masterfrom
perlun:fix/log-rebase-result-mismatch-errors
Open

Include more details when logging GitLabRebaseResultMismatch#336
perlun wants to merge 1 commit into
smarkets:masterfrom
perlun:fix/log-rebase-result-mismatch-errors

Conversation

@perlun

@perlun perlun commented Jan 26, 2022

Copy link
Copy Markdown

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

Comment thread marge/single_merge_job.py Outdated
@perlun

perlun commented Apr 1, 2022

Copy link
Copy Markdown
Author

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

@snim2

snim2 commented Apr 1, 2022

Copy link
Copy Markdown
Contributor

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

perlun commented Apr 26, 2022

Copy link
Copy Markdown
Author

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