153,356 packages matching “git-conflict”

@gitkraken/conflict-tools

v0.2.3 · 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.

AI-powered git conflict resolution.

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

No known vulnerabilities

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

git-json-resolver

v1.3.7 · 10 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.

A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

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

No known vulnerabilities

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

conflict-context

v0.2.0 · 13 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.

AI-assisted git conflict resolver that reconstructs why each side changed before proposing a merge.

171Downloads 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.0 (the latest release), from the OSV.dev database.

@gitwand/mcp

v3.6.1 · 6 hours 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.

GitWand MCP server — smart Git conflict resolution for AI agents (Claude, Cursor, Windsurf, Claude Code)

243Downloads 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 v3.6.1 (the latest release), from the OSV.dev database.

git-pincer

v0.1.3 · 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 simple and efficient terminal Git conflict resolution CLI tool.

2Downloads 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.3 (the latest release), from the OSV.dev database.

@gitwand/core

v3.6.1 · 6 hours 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.

GitWand core — automatic Git conflict resolution engine (powers @gitwand/cli, @gitwand/mcp, and the GitWand desktop app)

203Downloads 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 v3.6.1 (the latest release), from the OSV.dev database.

git-resolve-conflict

v2.0.0 · 6 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.

Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)

21Downloads 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 v2.0.0 (the latest release), from the OSV.dev database.

git-conflict-resolver

v1.3.7 · 10 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.

A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

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

No known vulnerabilities

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

husky-conflict-hook

v0.0.3 · 5 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.

husky hook used to check for git conflict

8Downloads 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 v0.0.3 (the latest release), from the OSV.dev database.

json-conflict-resolver

v1.3.7 · 10 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.

A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

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

No known vulnerabilities

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

parse-conflict-json

v6.0.0 · 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.

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

5.7MDownloads 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.

json-merge-resolver

v1.3.7 · 10 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.

A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

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

No known vulnerabilities

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

git-conflict-mcp

v1.12.5 · 7 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.

A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.

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

No known vulnerabilities

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

overleaf-forge

v2.9.1 · 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.

MCP server to read, edit, compile, and verify Overleaf/LaTeX projects over git: conflict-safe edits, figure upload, clean-build verification, citation and voice linting.

8Downloads 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 v2.9.1 (the latest release), from the OSV.dev database.

dnssd-advertise

v1.1.6 · 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.

A Bonjour DNS-SD service announcer via mDNS on UDP

3.9MDownloads 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.

detect-conflict

v1.0.1 · 10 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.

Small utility library that check if a new file content can be merged safely in the on-disk existing file.

78.1KDownloads 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.

stylelint-prettier

v5.0.3 · 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.

Runs prettier as an stylelint rule

881.4KDownloads 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 v5.0.3 (the latest release), from the OSV.dev database.

@scalar/cli

v2.0.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 command-line interface to work with OpenAPI files

26.9KDownloads 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 v2.0.1 (the latest release), from the OSV.dev database.

css-conflict-inspector

v0.3.1 · 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.

Find potential conflict in your CSS files - to avoid surprises when used in the context of Micro Frontends.

11.3KDownloads 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.1 (the latest release), from the OSV.dev database.

npm-merge-driver

v2.3.6 · 6 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.

git merge driver for automatically merging lockfiles

13.5KDownloads 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 v2.3.6 (the latest release), from the OSV.dev database.
1 / 50Next