conflicts
There are 38 repositories under conflicts topic.
r-lib/conflicted
An alternative conflict resolution strategy for R
MerginMaps/geodiff
Library for handling diffs for geospatial data
DigiLive/jQuery-Merge-for-php-diff
A client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.
hzdavid/findConflicts
一款查找Jar/类/日志/版本冲突的Maven插件(a maven plugin to find the conflicts of maven project)
jonschlinkert/add-filename-increment
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.
jonschlinkert/strip-filename-increment
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.
prince-chrismc/label-merge-conflicts-action
GitHub Action to automatically label PRs with merge conflicts
emosheeep/lockfile-conflicts
A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.
csaladenes/insurgent-dynamics
A hybrid system dynamics-time series method for conflict analysis using GDELT
icub-tech-iit/how-to-solve-pull-rebase-conflicts
Test repository showing how to resolve conflicts happening during a `git pull --rebase`
jonschlinkert/conflicts
Detects when a new file is different than an existing file and prompts the user for action.
warrickct/unity-scene-merging-guide
Just a quick guide on how to set up scene merging for unity.
yungvldai/reshala
CLI tool to resolve package.json merge conflicts 🤝
cedricwalter/git-branch-renamer-maven-plugin
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.
jonschlinkert/gulp-conflicts
Detects when a file to be written is different than an existing file and, if necessary, prompts the user for action.
mihneadb/find-conflicting-branches
An easy way to find those annoying conflicting branches
martinstarman/mersge
Simple 3-way merge editor for the terminal
motet-a/merge-matrix
Web service displaying conflicts between PRs
tj32gm/3-kingdoms-weather-shock
Data deposit for Extreme Weather Events and Military Conflict over Seven Centuries in Ancient Korea
mpawlow/couchdb-conflict-remover
A Python application that scans and removes all document conflicts from a CouchDB / Cloudant database
novikovadaria/Conflictology
Все работы по Конфликтологии. GeekBrains University | All works on Conflictology. GeekBrains University
tkoppop/ClearSyncIssues-on-Outlook
A script paired with batch to clear server sync failures from your outlook desktop application.
bert2/sabotage
💥 Toy Git client to easily provoke merge conflicts
bttgcm/sudan_acled
Interactive map of violent events in Sudan since 2019
LoLei/tug-overlap-checker
Check for course overlaps at Graz University of Technology
rimiti/pbxproj-merger
CLI tool to resolve your .pbxproj conflicts
shahzaneer/Git-and-Github-Fundamentals
All about Git Version Controlling System and GitHub the web based git-repositories hosting platform
shellscape/gulp-version-conflicts
Check for and report on module version conflicts for a package
Docmos/git-rebase-merge
Create a custom git command to perform a rebase via a merge
gdv21/pagina-web
treball final
JoeSwinehart/DataVizLab3
Lab 3 -- EDLD 652
kvinne-anc/Conflict-and-Climate-Project
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.
Liquizar/Git_Assignment_1
This is a Git Assignment for those who are learning Git as a beginner
janole/merge-conflicts
Show merge conflicts between two branches
lfre/spotter
Spots potential merge conflicts between open Pull Requests
OJFord/vim-quickfix-conflicts
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker