38,058 packages matching “merge-conflict”

grunt-merge-conflict

v0.0.2 · 13 years ago

85
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Grunt plugin for preventing you from accidentally comitting a merge conflict into your project

547Downloads across all versions in the last 7 days, from the official npm downloads API.BSDLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v0.0.2 (the latest release), from the OSV.dev database.

monaco-editor-merge-conflict

v0.2.1 · 27 days ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

VS Code-like inline merge conflict actions and preview for Monaco Editor

18Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v0.2.1 (the latest release), from the OSV.dev database.

@arii/boomtick-mcp

v0.4.0 · 19 days ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Boomtick MCP Guide: PR Rescue + Merge Conflict Agent

27Downloads across all versions in the last 7 days, from the official npm downloads API.

No known vulnerabilities

Known vulnerabilities affecting v0.4.0 (the latest release), from the OSV.dev database.

@lisang233/pi-sync

v0.2.5 · 10 days ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Personal Pi extension that syncs Pi configuration through Git with background auto-sync and git-style fetch/merge conflict handling.

558Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v0.2.5 (the latest release), from the OSV.dev database.

merge-assist-cli

v1.0.1 · 8 months ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

AI-powered merge conflict resolver using GitHub Copilot CLI

28Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.0.1 (the latest release), from the OSV.dev database.

dsh-git-panel

v0.1.19 · 7 days ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

DSH web GUI git panel: branch management, commit graph, VS Code-style side-by-side diff with merge-conflict resolution, and workspace file-tree change badges.

952Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v0.1.19 (the latest release), from the OSV.dev database.

@vexify-org/yaggs

v8.1.1 · 1 month ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

A powerful CLI argument parser, better than yargs. Features: Deprecation Warnings, Subcommand Aliases, Extended Type Validators, Default Value Merge, Conflict Detection, Exclusive Groups, Interactive Prompts

163Downloads across all versions in the last 7 days, from the official npm downloads API.Apache-2.0License declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v8.1.1 (the latest release), from the OSV.dev database.

githook-pre-commit

v1.1.4 · 7 years ago

85
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

> Check git merge conflict by default.

6Downloads across all versions in the last 7 days, from the official npm downloads API.ISCLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.1.4 (the latest release), from the OSV.dev database.

git-merge-forge

v1.1.6 · 6 months ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Modern browser-based Git merge conflict resolution tool with a multi-repo dashboard, three-pane Monaco editor, pre-merge conflict prediction, character-level diff, BASE pane, auto-resolve, and an AI assistant supporting Claude, OpenAI, Gemini, xAI, and Ol

6Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.1.6 (the latest release), from the OSV.dev database.

resolve-conflict-ai

v1.0.10 · 1 year ago

95
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

AI-powered Git merge conflict resolver using GPT

14Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.0.10 (the latest release), from the OSV.dev database.

parse-conflict-json

v6.0.0 · 4 months ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Parse a JSON string that has git merge conflicts, resolving if possible

4.6MDownloads across all versions in the last 7 days, from the official npm downloads API.ISCLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v6.0.0 (the latest release), from the OSV.dev database.

check_merge_conflict_cli

v1.0.2 · 8 years ago

85
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

merge conflict check

2Downloads across all versions in the last 7 days, from the official npm downloads API.ISCLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.0.2 (the latest release), from the OSV.dev database.

git-consol

v1.0.2 · 11 months ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Git merge conflict resolution TUI

0Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.0.2 (the latest release), from the OSV.dev database.

@gitfix/cli

v0.1.0-alpha.4 · 3 months ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

gfix - AI-powered merge conflict resolver

2Downloads across all versions in the last 7 days, from the official npm downloads API.SEE LICENSE IN LICENSE.txtLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v0.1.0-alpha.4 (the latest release), from the OSV.dev database.

@lucasschirm/aify

v1.0.5 · 1 month ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

A tiny cli command to get ServiceNow records locally with merge/conflict structure.

10Downloads across all versions in the last 7 days, from the official npm downloads API.ISCLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.0.5 (the latest release), from the OSV.dev database.

gitsynth

v0.3.0 · 1 year ago

95
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

GitSynth - Automatic Merge Conflict Resolution

5Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v0.3.0 (the latest release), from the OSV.dev database.

changelogkyper

v1.0.15 · 3 years ago

85
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

A project to maintain a Changelog automatically and never have a merge conflict again.

0Downloads across all versions in the last 7 days, from the official npm downloads API.ISCLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.0.15 (the latest release), from the OSV.dev database.

@shapeshift-labs/frontier-merge-metrics

v0.1.4 · 2 months ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Repo-shape and merge-conflict risk metrics for Git, Loom, and Frontier swarm workflows.

4Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v0.1.4 (the latest release), from the OSV.dev database.

@olllayor/aimerge

v0.3.8 · 11 months ago

100
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

AI-assisted Git merge conflict resolver with smart classification and confidence scoring

2Downloads across all versions in the last 7 days, from the official npm downloads API.

No known vulnerabilities

Known vulnerabilities affecting v0.3.8 (the latest release), from the OSV.dev database.

octoscripts-tag-merge-conflits

v1.0.3 · 9 years ago

85
0-100 score computed by this site from verifiable signals only: known OSV.dev advisories affecting this exact version, how recently it was published, and the repository's OpenSSF Scorecard.

Tags GitHub pull-requests when there is a merge conflict on Octoscripts

1Downloads across all versions in the last 7 days, from the official npm downloads API.MITLicense declared in the package manifest.

No known vulnerabilities

Known vulnerabilities affecting v1.0.3 (the latest release), from the OSV.dev database.
1 / 50Next