A plugin to visualise and resolve merge conflicts in neovim

Lua716

3 months ago

Turns off all rules that are unnecessary or might conflict with Prettier.

JavaScript5006mit

5 months ago

eslinteslint-configprettier

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

Python103mit

7 months ago

cligithelper-tool

Easy-to-use CUI for fixing git conflicts

Go1825mit

4 months ago

command-lineconflict-resolutioncui

No conflicts for your bin dependencies

PHP424mit

7 months ago

composerconflictdependency

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

TypeScript23118mit

6 days ago

browser-extensionchrome-extensionfirefox-addon

A fork of the DotNetZip project without signing with a solution that compiles cl

C#536other

3 months ago

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

Erlang251other

9 years ago

A theorem prover based on the conflict resolution calculus

Scala5other

3 years ago

Plugin for Sublime Text to help identify conflicting key mappings.

Python149mit

5 years ago

A JavaScript library for binding keyboard combos without the pain of key codes a

JavaScript2060mit

last year

javascriptkey-comboskeyboard

Description Cascadea 2 is its biggest update yet, with a revamped UI for macO

JavaScript619mit

2 years ago

chrome-extensionedge-extensionfirefox-addon

Description Cascadea 2 is its biggest update yet, with a revamped UI for macO

JavaScript628mit

last year

chrome-extensionedge-extensionfirefox-addon