GitLab Guardrails

Blocks GitLab web conflict resolution and guides developers to resolve conflicts locally.

GitLab Guardrails helps prevent accidental use of GitLab's web-based conflict resolution workflow. GitLab's "Resolve conflicts" interface can make it easy to resolve merge conflicts directly in the browser when the safer choice is to inspect and resolve them locally with Git. GitLab Guardrails adds a safety layer to GitLab by detecting conflict-resolution pages and blocking or warning against risky web-based conflict resolution actions. Instead, it guides developers toward resolving conflicts locally, where they can inspect the merge state, use their normal development tools, run tests, and review the resulting changes before pushing. What it does: Guards against GitLab's web-based "Resolve conflicts" workflow Provides a clear warning before potentially risky conflict-resolution actions Guides developers toward resolving merge conflicts locally Helps teams establish safer Git conflict-resolution practices Works directly on supported GitLab pages Why? Merge conflict resolution changes repository history and code. A convenient browser UI can hide important context that developers would normally inspect locally. This extension provides a small guardrail at the point where mistakes are easiest to make. GitLab Guardrails does not modify your repositories or resolve conflicts for you. It is designed to prevent accidental actions and encourage developers to use their normal local Git workflow. GitLab Guardrails is an independent developer tool and is not affiliated with, endorsed by, or sponsored by GitLab Inc.