Important: This documentation covers Yarn 1 (Classic).

For Yarn 2+ docs and migration guide, see yarnpkg.com.

keywords: merge conflict

found 7 packages in 19ms

npm-merge-driver52.8kISC2.3.6

git merge driver for automatically merging lockfiles

npmabout 1 month agonpm, lockfiles, package-lock.json, npm-shrinkwrap.json

grunt-merge-conflict786BSD0.0.2

Grunt plugin for preventing you from accidentally comitting a merge conflict into your project

btfordalmost 3 years agogrunt, git, merge conflict

@kgossent/sfdx-md-merge-driver87MIT0.1.29

git merge driver specific for Salesforce.com Metadata

KevinGossentCap4 months agosfdx, salesforce, metadata, git

sfdx-md-merge-driver23MIT0.1.7

git merge driver specific for Salesforce.com Metadata

jayreeabout 3 years agosfdx, salesforce, metadata, git

@gemini-testing/npm-merge-driver17ISC2.3.7

git merge driver for automatically merging lockfiles

npm10 months agonpm, lockfiles, package-lock.json, npm-shrinkwrap.json

Packages

Lightweight debugging utility for Node.js and the browser

debug, log, debugger

Lodash modular utilities.

modules, stdlib, util

React is a JavaScript library for building user interfaces.

A querystring parser that supports nesting and arrays, with a depth limit

querystring, qs, query, url

Higher-order functions and common patterns for asynchronous code

async, callback, module, utility

babel babel-core

Babel compiler core.

6to5, babel, classes, const