Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
Projects in Awesome Lists tagged with conflicts
A curated list of projects in awesome lists tagged with conflicts .
https://github.com/r-lib/conflicted
An alternative conflict resolution strategy for R
Last synced: 16 Nov 2024
https://github.com/digilive/jquery-merge-for-php-diff
A client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.
conflicts diff javascript jquery merge
Last synced: 08 Nov 2024
https://github.com/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.
conflict conflicts dirent duplicate file filename filepath fs increment javascript jonschlinkert name node nodejs path rename
Last synced: 02 Nov 2024
https://github.com/prince-chrismc/label-merge-conflicts-action
GitHub Action to automatically label PRs with merge conflicts
conflicts github github-actions github-api labels pull-request pull-requests
Last synced: 01 Nov 2024
https://github.com/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.
conflicts dirent duplicate file filename filepath increment javascript jonschlinkert name node nodejs number path rename strip vinyl
Last synced: 09 Nov 2024
https://github.com/emosheeep/lockfile-conflicts
A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.
automerge cli conflicts cooperation git infra lockfile merge merge-driver monorepo pnpm rebase workflow
Last synced: 18 Nov 2024
https://github.com/jonschlinkert/conflicts
Detects when a new file is different than an existing file and prompts the user for action.
conflict conflicts detect file file-system files fs gulp javascript jonschlinkert node nodejs prompt vinyl write
Last synced: 24 Oct 2024
https://github.com/cedricwalter/git-branch-renamer-maven-plugin
When working with many feature/release/bugix/hotfix branches, it is a bad idea to start changing the pom version as this will create merge conflicts using pull request. this plugin allow you to keep in ALL branches the same pom version for all your projects, for example MASTER-SNAPSHOT the version will be derived from branch name automatically when running in your continuous integration server.
agile apache apache-maven bamboo conflicts continuous-delivery continuous-deployment continuous-integration java jenkins maven pull-requests teamcity
Last synced: 12 Oct 2024
https://github.com/jonschlinkert/gulp-conflicts
Detects when a file to be written is different than an existing file and, if necessary, prompts the user for action.
conflict conflicts detect files gulp gulpplugin javascript node nodejs prompt stream through
Last synced: 24 Oct 2024
https://github.com/shellscape/gulp-version-conflicts
Check for and report on module version conflicts for a package
conflicts gulp gulp-plugin gulp-tasks gulpjs module nodejs npm versioning
Last synced: 28 Sep 2024
https://github.com/rimiti/pbxproj-merger
CLI tool to resolve your .pbxproj conflicts
cli conflicts golang ios merge merging pbxproj react-native
Last synced: 07 Nov 2024
https://github.com/lfre/spotter
Spots potential merge conflicts between open Pull Requests
Last synced: 11 Nov 2024
https://github.com/ojford/vim-quickfix-conflicts
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
conflict-resolution conflicts git quickfix vim
Last synced: 28 Oct 2024
