Item logo image for GitHub Resolve Conflicts Disabler

GitHub Resolve Conflicts Disabler

Item media 1 (screenshot) for GitHub Resolve Conflicts Disabler

Overview

Disables the Resolve conflicts action on GitHub pull requests to enforce team merge policy.

This extension disables the "Resolve conflicts" action on GitHub pull requests. It is designed for internal team use to prevent accidental conflict resolution via the GitHub web interface and to enforce resolving conflicts locally using git. The extension works entirely on the client side, does not collect, store, or transmit any user data, and only modifies the GitHub UI.

Details

  • Version
    1.0.0
  • Updated
    January 9, 2026
  • Offered by
    yevhen.turovets
  • Size
    3.37KiB
  • Languages
    English
  • Developer
    Email
    yevhen.turovets@corpsoft.io
  • Non-trader
    This developer has not identified itself as a trader. For consumers in the European Union, please note that consumer rights do not apply to contracts between you and this developer.

Privacy

Manage extensions and learn how they're being used in your organization
The developer has disclosed that it will not collect or use your data.

This developer declares that your data is

  • Not being sold to third parties, outside of the approved use cases
  • Not being used or transferred for purposes that are unrelated to the item's core functionality
  • Not being used or transferred to determine creditworthiness or for lending purposes

Related

Github to vscode

3.7

Quickly open github repos with vscode.dev or clone a repo directly to vscode.

GitHub PR Custom Filter

5.0

Add custom filters to GitHub PR page.

GitHub Discussion Reverser

0.0

Reverse the order of discussion comments on GitHub pull requests.

GitHub Whitespace

4.5

Redirect GitHub pull request pages to ignore whitespaces

GitLab MR Approval Guard

5.0

Blocks the GitLab merge button until at least one approval is received, bringing Premium-level safeguards to any team for free.

Review process enhancer

5.0

Extension to enhance the user experience on the Gitlab merge request process

GitHub Merge Guardian

5.0

Prevent incorrect merges on GitHub's pull request.

Fast-forward merge for GitHub

0.0

Shows whether a GitHub pull request or branch can be fast-forward merged.

GitHub Issue Helper

0.0

Summarizes GitHub issues and suggests possible fixes using an LLM.

Github Incident Alerts

5.0

Show extra warnings in Github when there's an active incident

GitHub PR Tool

3.0

Mark all files as viewed / not viewed in GitHub pull requests.

GitHub PR Merge Strategy Restrictor

4.7

Control GitHub PR merge strategies based on source and destination branches, and repository.

Github to vscode

3.7

Quickly open github repos with vscode.dev or clone a repo directly to vscode.

GitHub PR Custom Filter

5.0

Add custom filters to GitHub PR page.

GitHub Discussion Reverser

0.0

Reverse the order of discussion comments on GitHub pull requests.

GitHub Whitespace

4.5

Redirect GitHub pull request pages to ignore whitespaces

GitLab MR Approval Guard

5.0

Blocks the GitLab merge button until at least one approval is received, bringing Premium-level safeguards to any team for free.

Review process enhancer

5.0

Extension to enhance the user experience on the Gitlab merge request process

GitHub Merge Guardian

5.0

Prevent incorrect merges on GitHub's pull request.

Fast-forward merge for GitHub

0.0

Shows whether a GitHub pull request or branch can be fast-forward merged.

Google apps