Marge bot isn't working
Marge bot isn't creating new batches and reports that everything has a conflict:
2023-05-23 13:52:50,782 WARNING Skipping MR !10506, got conflicts while rebasing
2023-05-23 13:52:50,782 WARNING stderr: b'fatal: No rebase in progress?\n'
2023-05-23 13:52:50,782 WARNING stdout: b''
2023-05-23 13:52:50,782 WARNING git returned 128
2023-05-23 13:52:50,780 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 rebase --abort
2023-05-23 13:52:50,780 WARNING rebase failed, doing an --abort
2023-05-23 13:52:50,780 WARNING stderr: b'error: cannot rebase: You have unstaged changes.\nerror: Please commit or stash them.\n'
2023-05-23 13:52:50,780 WARNING stdout: b''
2023-05-23 13:52:50,780 WARNING git returned 1
2023-05-23 13:52:50,684 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 rebase wip/marge_bot_batch_merge_job
2023-05-23 13:52:50,541 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 checkout -B wip/romes/fixes --
2023-05-23 13:52:50,392 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 checkout -B wip/romes/fixes origin/wip/romes/fixes --
2023-05-23 13:52:50,392 WARNING Skipping MR !10484, got conflicts while rebasing
2023-05-23 13:52:50,392 WARNING stderr: b'fatal: No rebase in progress?\n'
2023-05-23 13:52:50,392 WARNING stdout: b''
2023-05-23 13:52:50,392 WARNING git returned 128
2023-05-23 13:52:50,390 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 rebase --abort
2023-05-23 13:52:50,390 WARNING rebase failed, doing an --abort
2023-05-23 13:52:50,390 WARNING stderr: b'error: cannot rebase: You have unstaged changes.\nerror: Please commit or stash them.\n'
2023-05-23 13:52:50,390 WARNING stdout: b''
2023-05-23 13:52:50,390 WARNING git returned 1
2023-05-23 13:52:50,333 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 rebase wip/marge_bot_batch_merge_job
2023-05-23 13:52:50,232 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 checkout -B wip/users-guide --
2023-05-23 13:52:50,118 INFO Running git -C /tmp/tmpcbq2nmen/tmpa57ke_p1 checkout -B wip/users-guide origin/wip/users-guide --
2023-05-23 13:52:50,118 WARNING Skipping MR !10477, got conflicts while rebasing
2023-05-23 13:52:50,118 WARNING stderr: b'fatal: No rebase in progress?\n'
2023-05-23 13:52:50,118 WARNING stdout: b''
2023-05-23 13:52:50,118 WARNING git returned 128
Looks like there's some junk in the checkout. I can cherry-pick scheduled MRs below without issues:
2023-05-23 13:52:47,928 WARNING Skipping unbatchable MR: "This MR has not passed CI."
2023-05-23 13:52:47,588 INFO Ensuring MR !10507 is mergeable
2023-05-23 13:52:47,069 INFO Ensuring MR !10506 is mergeable
2023-05-23 13:52:46,486 INFO Ensuring MR !10484 is mergeable
2023-05-23 13:52:46,304 WARNING Skipping unbatchable MR: "This MR has not passed CI."
2023-05-23 13:52:45,948 INFO Ensuring MR !10483 is mergeable
2023-05-23 13:52:45,365 INFO Ensuring MR !10477 is mergeable
2023-05-23 13:52:44,803 INFO Ensuring MR !10333 is mergeable