{"_id":"gulp-conflict","_rev":"26-58dbe3138a8dfcbd3c4fd0fec70fcffb","name":"gulp-conflict","description":"Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.","dist-tags":{"latest":"0.4.0"},"versions":{"0.1.0":{"name":"gulp-conflict","version":"0.1.0","description":"Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.","main":"index.js","scripts":{"test":"mocha -R spec"},"repository":{"type":"git","url":"git://github.com/klei/gulp-conflict"},"keywords":["gulpplugin","yeoman","slush","dest","confirm","ask","conflict"],"author":{"name":"Joakim Bengtson","email":"joakim@klei.se"},"license":"MIT","bugs":{"url":"https://github.com/klei/gulp-conflict/issues"},"homepage":"https://github.com/klei/gulp-conflict","dependencies":{"through2":"~0.4.1","gulp-util":"~2.2.14","inquirer":"~0.4.1","diff":"~1.0.8"},"devDependencies":{"chai":"~1.9.0","mocha":"~1.17.1"},"_id":"gulp-conflict@0.1.0","dist":{"shasum":"e959850f7f706adc54e02bfca2bc349f68f6e623","tarball":"https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.1.0.tgz","integrity":"sha512-zE7XBjJEnn/jMk/b/j2bTjsg+GdfAe1SKtHtnesdz9iFgpPXkfvqEztWDwpL70BwHPF9KQS/xrJlGImIrh99Rw==","signatures":[{"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","sig":"MEUCIQDAEGSdOsGYXLKjsmrXwmxelsAzRhV6BAzE6HlUC7o9mAIgHhfTcV9wmwQZ6PN9Qh0MeGyo1rADrB5zQXxfw69R54w="}]},"_from":".","_npmVersion":"1.3.25","_npmUser":{"name":"joakimbeng","email":"joakim@klei.se"},"maintainers":[{"name":"joakimbeng","email":"joakim@klei.se"}]},"0.1.1":{"name":"gulp-conflict","version":"0.1.1","description":"Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.","main":"index.js","scripts":{"test":"mocha -R spec"},"repository":{"type":"git","url":"git://github.com/klei/gulp-conflict"},"keywords":["gulpplugin","yeoman","slush","dest","confirm","ask","conflict"],"author":{"name":"Joakim Bengtson","email":"joakim@klei.se"},"license":"MIT","bugs":{"url":"https://github.com/klei/gulp-conflict/issues"},"homepage":"https://github.com/klei/gulp-conflict","dependencies":{"through2":"~0.4.1","gulp-util":"~2.2.14","inquirer":"~0.4.1","diff":"~1.0.8"},"devDependencies":{"chai":"~1.9.0","mocha":"~1.17.1"},"_id":"gulp-conflict@0.1.1","dist":{"shasum":"c306238c1946b94642a295924fa328d9568c303d","tarball":"https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.1.1.tgz","integrity":"sha512-mOM4PgeYBgsg8ucxm0vyA848TA/4tVlzPl/WxV3BBIDzY2FWGXVaZ6IO7LlowIxnsss+hVSPxf6V3X+jpmkoxg==","signatures":[{"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","sig":"MEUCIQCGwjXGSbSDPvOQ9iqWqEjVkWt8/RWzqz0G1zCutSoJzAIgAcsmEywdviwYW8bzr0xqd14gzk4f9YokuRUaqg6cd6Y="}]},"_from":".","_npmVersion":"1.3.25","_npmUser":{"name":"joakimbeng","email":"joakim@klei.se"},"maintainers":[{"name":"joakimbeng","email":"joakim@klei.se"}]},"0.1.2":{"name":"gulp-conflict","version":"0.1.2","description":"Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.","main":"index.js","scripts":{"test":"mocha -R spec"},"repository":{"type":"git","url":"git://github.com/slushjs/gulp-conflict"},"keywords":["gulpplugin","yeoman","slush","dest","confirm","ask","conflict"],"author":{"name":"Joakim Bengtson","email":"joakim@klei.se"},"license":"MIT","bugs":{"url":"https://github.com/slushjs/gulp-conflict/issues"},"homepage":"https://github.com/slushjs/gulp-conflict","dependencies":{"through2":"^0.4.1","gulp-util":"^2.2.14","inquirer":"^0.5.1","diff":"^1.0.8"},"devDependencies":{"chai":"~1.9.0","mocha":"~1.20.0"},"_id":"gulp-conflict@0.1.2","dist":{"shasum":"7dd9bc73242ff5e56da9609c4528340803ade39b","tarball":"https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.1.2.tgz","integrity":"sha512-OV7AxQ6/Miz3NCubO07sEauDwzHJrcafkKBLIyAxe0JggA4cpdEhNEFssNyZp35zSRyBInrOBjxrNt7V7In7Rw==","signatures":[{"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","sig":"MEUCIG2Q7n8djCeWA1p1VCpijjG2ucS5A4ltJVQCqBdm8YOCAiEA3LgvxGGrKfj5ZsBh5D3IuFPLT3GH2HV5LWR8jm2NI88="}]},"_from":".","_npmVersion":"1.3.17","_npmUser":{"name":"joakimbeng","email":"joakim@klei.se"},"maintainers":[{"name":"joakimbeng","email":"joakim@klei.se"}]},"0.2.0":{"name":"gulp-conflict","version":"0.2.0","description":"Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.","main":"index.js","scripts":{"test":"NODE_ENV=test mocha -R spec"},"repository":{"type":"git","url":"git://github.com/slushjs/gulp-conflict"},"keywords":["gulpplugin","yeoman","slush","dest","confirm","ask","conflict"],"author":{"name":"Joakim Bengtson","email":"joakim@klei.se"},"license":"MIT","bugs":{"url":"https://github.com/slushjs/gulp-conflict/issues"},"homepage":"https://github.com/slushjs/gulp-conflict","dependencies":{"through2":"^0.4.1","gulp-util":"^2.2.14","inquirer":"^0.5.1","diff":"^1.0.8"},"devDependencies":{"chai":"~1.9.0","mocha":"~1.20.0"},"_id":"gulp-conflict@0.2.0","dist":{"shasum":"4ad958df64aaa98d242cea0ff61021a53db2865e","tarball":"https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.2.0.tgz","integrity":"sha512-Ng3yC+5ZjKGqEuCyaRc7HkVkGTjTHmC2NFOXT/Z3qyU+C/vfvQ+WTnX0LEna+/9D/50ch3W7ti6EV6vai6jLuA==","signatures":[{"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","sig":"MEYCIQCMVQ8Fbq70ay2OPPMcX2Oek8YMsg7HyaR7kut9R3bh6gIhAJSdH5rikoYmuXgRiy9dYHCghu0Bqdo93llxREkiyRqQ"}]},"_from":".","_npmVersion":"1.3.17","_npmUser":{"name":"joakimbeng","email":"joakim@klei.se"},"maintainers":[{"name":"joakimbeng","email":"joakim@klei.se"}]},"0.3.0":{"name":"gulp-conflict","version":"0.3.0","description":"Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.","main":"index.js","scripts":{"test":"NODE_ENV=test mocha -R spec"},"repository":{"type":"git","url":"git://github.com/slushjs/gulp-conflict"},"keywords":["gulpplugin","yeoman","slush","dest","confirm","ask","conflict"],"author":{"name":"Joakim Carlstein","email":"joakim@klei.se"},"license":"MIT","bugs":{"url":"https://github.com/slushjs/gulp-conflict/issues"},"homepage":"https://github.com/slushjs/gulp-conflict","dependencies":{"through2":"~0.6.3","gulp-util":"~3.0.1","inquirer":"~0.8.0","diff":"^1.0.8"},"devDependencies":{"chai":"~1.10.0","mocha":"~2.0.1"},"_id":"gulp-conflict@0.3.0","dist":{"shasum":"e65ba9cb23f77250e7964b581b1efc5f61629e8c","tarball":"https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.3.0.tgz","integrity":"sha512-BVYT6IWYNd8+4Ke91/7mqAro9gCYq9Qtd8lSRlT/BnfJ5/l3sPoWulblb8soPKjBd4Ol35i3QB5B4joVtRsJDA==","signatures":[{"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","sig":"MEUCIH0JqFHGNl7/bjRF7sDucjtqlx3waOx+Skh4cSIhwxfCAiEArJSOFsD4/zQgdvRnlgc0Plpj8J0/o+vO5QAdmBzv6rc="}]},"_from":".","_npmVersion":"1.3.17","_npmUser":{"name":"joakimbeng","email":"joakim@klei.se"},"maintainers":[{"name":"joakimbeng","email":"joakim@klei.se"}]},"0.4.0":{"name":"gulp-conflict","version":"0.4.0","description":"Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.","main":"index.js","scripts":{"test":"NODE_ENV=test mocha -R spec"},"repository":{"type":"git","url":"git://github.com/slushjs/gulp-conflict"},"keywords":["gulpplugin","yeoman","slush","dest","confirm","ask","conflict"],"author":{"name":"Joakim Carlstein","email":"joakim@klei.se"},"license":"MIT","bugs":{"url":"https://github.com/slushjs/gulp-conflict/issues"},"homepage":"https://github.com/slushjs/gulp-conflict","dependencies":{"through2":"~0.6.3","gulp-util":"~3.0.1","inquirer":"~0.8.0","diff":"^1.0.8"},"devDependencies":{"chai":"~1.10.0","mocha":"~2.0.1"},"gitHead":"7cb768a0f97e34111e6346c66d7e9e884433fa00","_id":"gulp-conflict@0.4.0","_shasum":"0273cf2dc0c8f20e9432de15525bf31766348fee","_from":".","_npmVersion":"2.7.4","_nodeVersion":"0.10.29","_npmUser":{"name":"joakimbeng","email":"joakim@klei.se"},"maintainers":[{"name":"joakimbeng","email":"joakim@klei.se"}],"dist":{"shasum":"0273cf2dc0c8f20e9432de15525bf31766348fee","tarball":"https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.4.0.tgz","integrity":"sha512-ndNFYeboEgJ4EAhW34VMmZjDAhz4QaHtgCz33pKRuo2T+DF9HYOC+uzh3oBd5xfnHsUADUXBWRMwJbNjmO93mg==","signatures":[{"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","sig":"MEYCIQC6pOhZeqGZwV20SuXFHGRkOuyUWUpkp5Wvwk+tDB9wagIhAIqYERD+9/wAM66si5N6UXqGsZ0qGQYVNa5McUinhk+N"}]}}},"readme":"# gulp-conflict [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][depstat-image]][depstat-url]\n\n> Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.\n\n## Primary objective\n\nUsed before any `gulp.dest` step when using [`slush`](https://www.npmjs.org/package/slush) as a Yeoman replacement.\n\n## Installation\n\n### For global use with slush\n\nInstall `gulp-conflict` as a dependency:\n\n```shell\nnpm install --save gulp-conflict\n```\n\n### For local use with gulp\n\nInstall `gulp-conflict` as a development dependency:\n\n```shell\nnpm install --save-dev gulp-conflict\n```\n\n## Usage\n\n### In your `slushfile.js`:\n\n```javascript\nvar conflict = require(\"gulp-conflict\");\n\ngulp.src(__dirname + '/templates/**')\n  .pipe(conflict('./'))\n  .pipe(gulp.dest('./'));\n```\n\n### In your `gulpfile.js`:\n\n```javascript\nvar install = require(\"gulp-conflict\");\n\ngulp.src(['./files/*.js'])\n  .pipe(conflict('./dir'))\n  .pipe(gulp.dest('./dir'));\n```\n\n## API\n\n### conflict(dest, options)\n\n#### dest\n\nType: `String`, *required*\n\nSpecify destination directory to compare files in, should be the same as destination directory for `gulp.dest`.\n\n#### options\n\nType: `Object`, *optional*\n\n**options.cwd** - specify another working directory than `process.cwd()`\n\n**options.defaultChoice** - default choice on conflicts e.g. `'y'` (replace, default), `'n'` (skip), `'d'` (diff)\n\n## License\n\n[MIT License](http://en.wikipedia.org/wiki/MIT_License)\n\n[npm-url]: https://npmjs.org/package/gulp-conflict\n[npm-image]: https://badge.fury.io/js/gulp-conflict.png\n\n[travis-url]: http://travis-ci.org/slushjs/gulp-conflict\n[travis-image]: https://secure.travis-ci.org/slushjs/gulp-conflict.png?branch=master\n\n[depstat-url]: https://david-dm.org/slushjs/gulp-conflict\n[depstat-image]: https://david-dm.org/slushjs/gulp-conflict.png\n","maintainers":[{"email":"joakim@beng.se","name":"joakimbeng"}],"time":{"modified":"2022-06-18T16:49:54.604Z","created":"2014-03-23T15:02:31.366Z","0.1.0":"2014-03-23T15:02:31.366Z","0.1.1":"2014-03-24T14:06:18.393Z","0.1.2":"2014-06-01T15:51:02.058Z","0.2.0":"2014-07-29T10:22:36.315Z","0.3.0":"2014-11-13T19:06:59.046Z","0.4.0":"2015-04-26T08:45:40.899Z"},"homepage":"https://github.com/slushjs/gulp-conflict","keywords":["gulpplugin","yeoman","slush","dest","confirm","ask","conflict"],"repository":{"type":"git","url":"git://github.com/slushjs/gulp-conflict"},"author":{"name":"Joakim Carlstein","email":"joakim@klei.se"},"bugs":{"url":"https://github.com/slushjs/gulp-conflict/issues"},"license":"MIT","readmeFilename":"README.md","users":{"jonkemp":true,"daam":true,"rubiadias":true,"tdmalone":true}}