#

conflicts

Here are 10 public repositories matching this topic...

DigiLive / jQuery-Merge-for-php-diff

A client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.

javascript jquery diff merge conflicts

Updated Mar 1, 2022
JavaScript

jonschlinkert / add-filename-increment

When copying or moving files, it's common for operating systems to automatically add an increment or 'copy' to duplicate file names. This does that for Node.js applications, with automatic platform detection and support for Linux, MacOs, and Windows conventions.

nodejs javascript node fs rename file path name filepath conflict conflicts filename increment duplicate dirent jonschlinkert

Updated Sep 4, 2019
JavaScript

jonschlinkert / strip-filename-increment

Operating systems commonly add a trailing increment, or the word 'copy', or something similar to duplicate files. This strips those increments. Tested on Windows, MacOS, and Linux.

nodejs javascript node rename file path number name filepath vinyl strip conflicts filename increment duplicate dirent jonschlinkert

Updated Sep 4, 2019
JavaScript

jonschlinkert / conflicts

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

nodejs javascript gulp files node detect fs file prompt file-system write vinyl conflict conflicts jonschlinkert

Updated Dec 17, 2018
JavaScript

yungvldai / reshala

CLI tool to resolve package.json merge conflicts 🤝

git cli npm merge lerna package-json resolve conflicts

Updated Feb 25, 2022
JavaScript

jonschlinkert / gulp-conflicts

Detects when a file to be written is different than an existing file and, if necessary, prompts the user for action.

nodejs javascript gulp files node detect stream prompt gulpplugin conflict conflicts through

Updated Nov 22, 2018
JavaScript

motet-a / merge-matrix

Web service displaying conflicts between PRs

github git conflicts

Updated Nov 28, 2017
JavaScript

shellscape / gulp-version-conflicts

Check for and report on module version conflicts for a package

nodejs gulp npm gulp-plugin gulp-tasks module versioning gulpjs conflicts

Updated Jan 24, 2018
JavaScript

janole / merge-conflicts

Show merge conflicts between two branches

git git-flow merge ci-cd cicd conflict conflicts

Updated Dec 15, 2020
JavaScript

gdv21 / pagina-web

treball final

geography conflicts geopolitics

Updated Jun 15, 2022
JavaScript

Improve this page

Add a description, image, and links to the conflicts topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the conflicts topic, visit your repo's landing page and select "manage topics."