Web service displaying conflicts between PRs

Show merge conflicts between two branches

Interactive map of violent events in Sudan since 2019

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 w…

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

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

An easy way to find those annoying conflicting branches

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

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.

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.

All about Git Version Controlling System and GitHub the web based git-repositories hosting platform

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.

CLI tool to resolve your .pbxproj conflicts

Spots potential merge conflicts between open Pull Requests

Все работы по Конфликтологии. GeekBrains University | All works on Conflictology. GeekBrains University

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

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

Check for and report on module version conflicts for a package

💥 Toy Git client to easily provoke merge conflicts