search

pepakriz / gitlab-merger-bot

GitLab Merger Bot
56 stars 15 forks source link

Rebase #214

Open gjrtimmer opened 2 months ago

gjrtimmer commented 2 months ago

@pepakriz The MR queue I have does not get merged, after the gets merged into main, because everything has to be rebased. I'm an missing some setting here?

I did set the merge setting correct o fast-forward, but all my merge requests are required to be rebased. Hope you can give me some pointers.

gjrtimmer commented 2 months ago

I figured out that on the pipeline train I have, the merge requests needs to be rebased, but the status that it has in the json is "Conflict" after rebasing everything should continue as it should.

pepakriz commented 2 months ago

I'm not sure if I understand you correctly. Based on your second comment, I assume you're trying to use this bot with the merge trains feature. Why do you need it? I don't have any experience with merge trains because I have a free account, but based on my knowledge, when you have merge trains, you don't need this merge bot. Or am I wrong?

gjrtimmer commented 1 month ago

OK, so I'm running this with a self-hosted community edition. Here is what happens. I have a very large bunch of merge requests to pull through. Each MR costs about 1 hour build with a total of 4 runner nodes.

The Merge requests are prepared, and they have only a few difference mainly difference in version in a config file to build another version. What happens is dat after each merge a rebase is required of all previous. Now for some reason, maybe because I;m using GitLab community, Gitlab detect these normal merge requests as conflicts. I figured that when this change is made, Gitlab merger bot rebases the MR and continues with the next merge request.

pepakriz commented 1 month ago

they have only a few difference mainly difference in version in a config file

If you have two MRs with a change on the same line then "conflict" is expected, isn't it?