Handle auto merging of MRs with merge-conflicts about kira-dependencies HOT 6 CLOSED

Hi, just wanted to follow up on this!

To work around my issue I've setup kira-stale bot to close out kira-dependencies MRs that remain open after a day (with the assumption that these MRs have failed for the reasons I originally described). This allows for the kira-dependencies bot to run the following day and open new MRs which will then attempt to try an auto-merge again, hopefully with better luck. This has been working out very well.

Below is the triage policy I've been using to do this:

resource_rules:
  merge_requests:
    rules:
      - name: Close stale dependabot merge requests
        conditions:
          date:
            attribute: created_at
            condition: older_than
            interval_type: days
            interval: 1
          state: opened
          labels:
            - 'dependencies'
        actions:
          status: close
          comment: |
            This dependency has been sitting unmerged for too long!

            It was last updated at {{updated_at}}
            /unassign
            /remove_milestone
            /lock

from kira-dependencies.

Marge bot seems pretty cool, I think the merge train stuff makes some of this tool a bit moot.

But in regards to this issue I don't see marge-bot helpful. It won't handle the merge conflicts for us.

If anything goes wrong (merge conflicts, tests that fail, etc.) she'll leave a message on the merge-request, so you'll get notified.

from kira-dependencies.

I would love to hear your feedback about merge trains! I haven't used it lately.

from kira-dependencies.

After doing some research, I don't believe merge trains will help us in this case. They just allow for testing a merge commit before it actually gets merged, which doesn't help our case.

I think a solution here may be to simply rebase any existing dependabot MRs on to the current master when found. The idea being, while on the first run there will be MRs that have merge conflicts (due to other MRs auto-merging causing new merge conflicts) but on the second run those MRs will be rebased and then be auto-mergable without conflicts (due to the rebase). Then keep repeating that until all MRs are auto-merged.

I'm also wondering if this could be accomplished by having the script attempt to retry the pipeline job if it runs and detects dependabot MRs that have merge conflicts. This would of course cause it to re-run and rebase those MRs and eventually all MRs would be merged.

Github dependabot will rebase its PRs in a similar way as I describe, I believe.

from kira-dependencies.

See https://github.com/smarkets/marge-bot
It might be helpful.

from kira-dependencies.

@bpatram awesome! Thanks a lot!

from kira-dependencies.