conflicts

An alternative conflict resolution strategy for R

Library for handling diffs for geospatial data

一款查找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.

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.

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

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

An easy way to find those annoying conflicting branches

Web service displaying conflicts between PRs

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

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

GitHub Action to automatically label PRs with merge conflicts

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.

Tool for more easily merging of package.json files

💥 Toy Git client to easily provoke merge conflicts

A script paired with batch to clear server sync failures from your outlook desktop application.

CLI tool to resolve your .pbxproj conflicts

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

Check for and report on module version conflicts for a package

Check for course overlaps at Graz University of Technology

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

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

Show merge conflicts between two branches

Interactive map of violent events in Sudan since 2019

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.

Spots potential merge conflicts between open Pull Requests

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.

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

Create a custom git command to perform a rebase via a merge