conflicts

An alternative conflict resolution strategy for R

Library for handling diffs for geospatial data

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

一款查找Jar/类/日志/版本冲突的Maven插件(a maven plugin to find the conflicts of maven project)

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.

A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.

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.

GitHub Action to automatically label PRs with merge conflicts

Test repository showing how to resolve conflicts happening during a `git pull --rebase`

A hybrid system dynamics-time series method for conflict analysis using GDELT

Just a quick guide on how to set up scene merging for unity.

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

CLI tool to resolve package.json merge conflicts 🤝

A collection of tools for analyzing dependency conflicts in Revit plugins

An easy way to find those annoying conflicting branches

Simple 3-way merge editor for the terminal

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

Web service displaying conflicts between PRs

Data deposit for Extreme Weather Events and Military Conflict over Seven Centuries in Ancient Korea

A Python application that scans and removes all document conflicts from a CouchDB / Cloudant database