Web service displaying conflicts between PRs

Check for and report on module version conflicts for a package

CLI tool to resolve your .pbxproj conflicts

Experimenting with Git branches/merges/conflicts. Collaboration with Can Toraman

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

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

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

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

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

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.

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.

Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker

Check for course overlaps at Graz University of Technology

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

Placidus is a formal verification and management platform for Software Defined Networks, and it has a core that verifies the following properties: conflicts, redundancies and reachability on network topologies.

Show merge conflicts between two branches

Lab 3 -- EDLD 652

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

An analysis of the correlations between incidents of armed conflict, fatalities, high temperatures, and cities of traditional cultural crossroads, specifically, an analysis on the Silk Road cities, as hotbeds of violence, high heat, and cultural diversity.