A client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.
-
Updated
Mar 1, 2022 - JavaScript
A client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.
Library for handling diffs for geospatial data
一款查找Jar/类/日志/版本冲突的Maven插件(a maven plugin to find the conflicts of maven project)
GitHub Action to automatically label PRs with merge conflicts
A hybrid system dynamics-time series method for conflict analysis using GDELT
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.
Detects when a new file is different than an existing file and prompts the user for action.
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.
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 w…
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
An easy way to find those annoying conflicting branches
Add a description, image, and links to the conflicts topic page so that developers can more easily learn about it.
To associate your repository with the conflicts topic, visit your repo's landing page and select "manage topics."