git-conflict.nvim

git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim

Lua1007

15 days ago

statebox

Erlang state "monad" with merge/conflict-resolution capabilities. Useful for Ria

Erlang253other

10 years ago

databooks

databooks

A CLI tool to reduce the friction between data scientists by reducing git confli

Python107mit

last year

cligithelper-tool

FindKeyConflicts

Plugin for Sublime Text to help identify conflicting key mappings.

Python149mit

6 years ago

composer-bin-plugin

No conflicts for your bin dependencies

PHP462mit

last year

composerconflictdependency

refined-github

refined-github

Description Refined GitHub is a Safari extension that simplifies the GitHub.c

TypeScript24803mit

22 days ago

browser-extensionchrome-extensionfirefox-addon

DotNetZip.Semverd

Please use System.IO.Compression! A fork of the DotNetZip project without signin

C#546other

6 months ago

Mac-CLI

Mac-CLI

Description ** Featured by Apple on "Best New Apps & Updates" and "Best Calen

Shell8899mit

10 months ago

bashclicommand-line-tool

git-conflict.nvim

git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim

Lua1007

15 days ago

databooks

databooks

A CLI tool to reduce the friction between data scientists by reducing git confli

Python107mit

last year

cligithelper-tool

FindKeyConflicts

Plugin for Sublime Text to help identify conflicting key mappings.

Python149mit

6 years ago

composer-bin-plugin

No conflicts for your bin dependencies

PHP462mit

last year

composerconflictdependency

refined-github

refined-github

Description Refined GitHub is a Safari extension that simplifies the GitHub.c

TypeScript24803mit

22 days ago

browser-extensionchrome-extensionfirefox-addon

DotNetZip.Semverd

Please use System.IO.Compression! A fork of the DotNetZip project without signin

C#546other

6 months ago

Mac-CLI

Mac-CLI

Description ** Featured by Apple on "Best New Apps & Updates" and "Best Calen

Shell8899mit

10 months ago

bashclicommand-line-tool