36,984 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

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

@vexify-org/yaggs

v8.1.0 · 21 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.

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

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

opensource-git

v1.1.8 · 8 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.

A free, open-source Git GUI — commit graph, stashes, branch management, and a visual merge conflict editor. Works with local repos, GitHub, and self-hosted GitLab.

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

@lucasschirm/aify

v1.0.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.

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

596Downloads 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.

@arii/boomtick-mcp

v0.3.5 · 1 day 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

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

No known vulnerabilities

Known vulnerabilities affecting v0.3.5 (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.

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 v1.1.4 (the latest release), from the OSV.dev database.

merge-assist-cli

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

AI-powered merge conflict resolver using GitHub Copilot CLI

24Downloads 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.

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

15Downloads 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.

@shapeshift-labs/frontier-merge-metrics

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

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

13Downloads 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.

@gitfix/cli

v0.1.0-alpha.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.

gfix - AI-powered merge conflict resolver

3Downloads 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.

branchguard-cli

v0.3.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.

Lightweight Git merge conflict pre-check CLI.

10Downloads 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.

gitsocket

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

Sync layer for AI agents working on the same repo: presence, soft path claims, and overwrite warnings before the merge conflict. Claude Code hooks + CLI + MCP server.

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

No known vulnerabilities

Known vulnerabilities affecting v0.3.0 (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.

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.

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

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

1Downloads 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.

@olllayor/aimerge

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

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

1Downloads 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.

tailwind-merge

v3.6.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.

Merge Tailwind CSS classes without style conflicts

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

git-consol

v1.0.2 · 9 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.

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

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