Merge Tailwind CSS classes without style conflicts

Merges lockfiles. Can automatically fix merge conflicts

Detects when a new file is different than an existing file and prompts the user for action.

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

Merges lockfiles. Can automatically fix merge conflicts

Theia - Merge Conflicts Extension

Detect potential file system conflicts and if necessary prompt the user before overwriting files.

To avoid style conflicts (CSS collisions/interference side effects) when using Tailwind CSS with other UI libraries like Antd, Vuetify etc.

"Descope" an array of GLSL tokens such that they can be safely inlined alongside within another shader without causing any global variable conflicts.

Merge CSS utility classes without style conflicts - small and zero config

Remove conflicts from a semver range

Do you wanna use tslint and prettier without conflicts? tslint-config-prettier disables all conflicting rules that may cause such problems. Prettier takes care of formatting and tslint the rest.

GitWand CLI — resolve Git conflicts from your terminal or CI pipeline

A library for binding to keys and key combos without the pain of key codes and key combo conflicts.

A Node.js CLI tool that automatically resolves conflicts in package.json and package-lock.json files

Rush Lockfile Explorer: The UI for solving version conflicts quickly in a large monorepo

Theia - Merge Conflicts Extension

Add namespace to Redux action type constants without name conflicts.

Audit installed agent skills, conflicts, and context costs.

A lightweight CLI tool & library to build dependency graphs and resolve semver conflicts.