search

smarkets / marge-bot

A merge-bot for GitLab
BSD 3-Clause "New" or "Revised" License
696 stars 137 forks source link

Include more details when logging GitLabRebaseResultMismatch #336

Open perlun opened 2 years ago

perlun commented 2 years ago

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

perlun commented 2 years ago

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

snim2 commented 2 years ago

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 commented 2 years ago

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