conflicts topic

An alternative conflict resolution strategy for R

r-lib

Library for handling diffs for geospatial data

MerginMaps

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

DigiLive

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

hzdavid

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 de...

jonschlinkert