An alternative conflict resolution strategy for R

r conflicts

• Updated Feb 22, 2024
• R

Library for handling diffs for geospatial data

diff gis geopackage conflicts handling-diffs merginmaps

• Updated Oct 16, 2026
• Python

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

javascript jquery diff merge conflicts

• Updated Mar 1, 2022
• JavaScript

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

java log maven conflicts jarconflicts classconflicts logconflicts

• Updated Oct 12, 2018
• Java

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.

nodejs javascript node fs rename file path name filepath conflict conflicts filename increment duplicate dirent jonschlinkert

• Updated Sep 4, 2019
• JavaScript

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

git cli workflow merge monorepo infra rebase pnpm conflicts cooperation lockfile merge-driver automerge

• Updated Jun 15, 2026
• JavaScript

GitHub Action to automatically label PRs with merge conflicts

github github-api labels pull-request pull-requests conflicts github-actions

• Updated Nov 9, 2026
• TypeScript

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.

nodejs javascript node rename file path number name filepath vinyl strip conflicts filename increment duplicate dirent jonschlinkert

• Updated Sep 4, 2019
• JavaScript

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

python time-series timeline matlab gdelt system-dynamics conflicts gdelt-data gdelt-events time-series-analysis insurgency conflict-analysis exploratorium

• Updated Aug 24, 2018
• Jupyter Notebook

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

git tutorial unity guide scene conflicts merging unityyamlmerge

• Updated Nov 14, 2018

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

git tutorial guide merge how-to rebase conflicts

• Updated Nov 18, 2020

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

nodejs javascript gulp files node detect fs file prompt file-system write vinyl conflict conflicts jonschlinkert

• Updated Dec 17, 2018
• JavaScript

CLI tool to resolve package.json merge conflicts 🤝

git cli npm merge lerna package-json resolve conflicts

• Updated Feb 25, 2022
• JavaScript

A collection of tools for analyzing dependency conflicts in Revit plugins

dependencies revit conflicts

• Updated Sep 6, 2026
• C#

A Dynamic Wikidata-Based Historical War Dataset

data-science database sparql wikidata history economics dataset historical-data conflicts wars geopolitics historical-conflicts

• Updated Oct 22, 2026
• Python

An easy way to find those annoying conflicting branches

git branch conflicts conflict-detection

• Updated Oct 10, 2023
• Python

Simple 3-way merge editor for the terminal

git rust console terminal merge rust-lang conflict conflicts

• Updated Sep 9, 2022
• Rust

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

nodejs javascript gulp files node detect stream prompt gulpplugin conflict conflicts through

• Updated Nov 22, 2018
• JavaScript

Web service displaying conflicts between PRs

github git conflicts

• Updated Nov 28, 2017
• JavaScript

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

climate war conflicts ancient-kingdom

• Updated Mar 2, 2021