Resolve GitLab MR Conflicts

@lraphael >=0.3.0 Automation

GitLab counterpart to archon-resolve-conflicts. Rebases an MR onto its target branch, auto-resolves simple conflicts (additions, imports, formatting, dependency-list merges), presents options for complex conflicts, validates the resolution (ruff/pytest/tsc/go), and force-pushes with --force-with-lease.

Install

archon workflow install archon-resolve-mr-conflicts

Source

Pinned to commit 6e39b359

View YAML on GitHub →
← Back to all workflows