GitHub topics: conflicts
r-lib/conflicted
An alternative conflict resolution strategy for R
Language: R - Size: 4.45 MB - Last synced at: 5 days ago - Pushed at: about 1 year ago - Stars: 250 - Forks: 14
MerginMaps/geodiff
Library for handling diffs for geospatial data
Language: Python - Size: 2.84 MB - Last synced at: 19 days ago - Pushed at: 19 days ago - Stars: 157 - Forks: 19
prince-chrismc/label-merge-conflicts-action
GitHub Action to automatically label PRs with merge conflicts
Language: TypeScript - Size: 4.04 MB - Last synced at: 8 days ago - Pushed at: 12 days ago - Stars: 9 - Forks: 5
lookup-foundation/DependencyTools
A collection of tools for analyzing dependency conflicts in Revit plugins
Language: C# - Size: 80.1 KB - Last synced at: 25 days ago - Pushed at: about 1 month ago - Stars: 0 - Forks: 0
emosheeep/lockfile-conflicts
A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.
Language: TypeScript - Size: 607 KB - Last synced at: 26 days ago - Pushed at: 11 months ago - Stars: 11 - Forks: 0
ribeiropdiogo/skald
This repository contains Skald, a proof-of-concept that aims to improve truth discovery by tracking reputation.
Language: Python - Size: 127 KB - Last synced at: 3 months ago - Pushed at: 3 months ago - Stars: 0 - Forks: 0
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.
Language: JavaScript - Size: 16.6 KB - Last synced at: 8 days ago - Pushed at: over 5 years ago - Stars: 10 - Forks: 1
csaladenes/insurgent-dynamics
A hybrid system dynamics-time series method for conflict analysis using GDELT
Language: Jupyter Notebook - Size: 89.1 MB - Last synced at: 5 months ago - Pushed at: over 6 years ago - Stars: 8 - Forks: 2
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.
Language: JavaScript - Size: 23.4 KB - Last synced at: 28 days ago - Pushed at: over 5 years ago - Stars: 22 - Forks: 1
tj32gm/3-kingdoms-weather-shock
Data deposit for Extreme Weather Events and Military Conflict over Seven Centuries in Ancient Korea
Size: 287 KB - Last synced at: 9 months ago - Pushed at: about 4 years ago - Stars: 3 - Forks: 0
shahzaneer/Git-and-Github-Fundamentals
All about Git Version Controlling System and GitHub the web based git-repositories hosting platform
Size: 401 KB - Last synced at: 9 months ago - Pushed at: 9 months ago - Stars: 1 - Forks: 0
DigiLive/jQuery-Merge-for-php-diff
A client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.
Language: JavaScript - Size: 106 KB - Last synced at: 12 days ago - Pushed at: about 3 years ago - Stars: 74 - Forks: 17
jonschlinkert/gulp-conflicts
Detects when a file to be written is different than an existing file and, if necessary, prompts the user for action.
Language: JavaScript - Size: 384 KB - Last synced at: 26 days ago - Pushed at: over 6 years ago - Stars: 4 - Forks: 0
yungvldai/reshala
CLI tool to resolve package.json merge conflicts 🤝
Language: JavaScript - Size: 2.28 MB - Last synced at: 4 days ago - Pushed at: about 3 years ago - Stars: 5 - Forks: 1
martinstarman/mersge
Simple 3-way merge editor for the terminal
Language: Rust - Size: 1.64 MB - Last synced at: about 2 months ago - Pushed at: over 2 years ago - Stars: 3 - Forks: 0
hzdavid/findConflicts
一款查找Jar/类/日志/版本冲突的Maven插件(a maven plugin to find the conflicts of maven project)
Language: Java - Size: 28.3 KB - Last synced at: almost 2 years ago - Pushed at: over 6 years ago - Stars: 38 - Forks: 6
icub-tech-iit/how-to-solve-pull-rebase-conflicts
Test repository showing how to resolve conflicts happening during a git pull --rebase
Size: 22.5 KB - Last synced at: about 2 years ago - Pushed at: over 4 years ago - Stars: 5 - Forks: 1
shellscape/gulp-version-conflicts 📦
Check for and report on module version conflicts for a package
Language: JavaScript - Size: 49.8 KB - Last synced at: 4 days ago - Pushed at: over 7 years ago - Stars: 1 - Forks: 0
novikovadaria/Conflictology
Все работы по Конфликтологии. GeekBrains University | All works on Conflictology. GeekBrains University
Size: 15.6 KB - Last synced at: about 1 month ago - Pushed at: over 2 years ago - Stars: 2 - Forks: 0
levindoneto/Placidus
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.
Language: Java - Size: 153 MB - Last synced at: about 2 years ago - Pushed at: over 4 years ago - Stars: 0 - Forks: 0
bttgcm/sudan_acled
Interactive map of violent events in Sudan since 2019
Language: HTML - Size: 4.08 MB - Last synced at: about 2 years ago - Pushed at: over 3 years ago - Stars: 1 - Forks: 0
warrickct/unity-scene-merging-guide
Just a quick guide on how to set up scene merging for unity.
Size: 2.93 KB - Last synced at: about 2 years ago - Pushed at: over 6 years ago - Stars: 4 - Forks: 0
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.
Language: Java - Size: 34.2 KB - Last synced at: 22 days ago - Pushed at: over 7 years ago - Stars: 4 - Forks: 0
OJFord/vim-quickfix-conflicts
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
Language: Vim script - Size: 4.88 KB - Last synced at: 24 days ago - Pushed at: over 5 years ago - Stars: 0 - Forks: 0
bert2/sabotage
💥 Toy Git client to easily provoke merge conflicts
Language: C# - Size: 294 KB - Last synced at: 1 day ago - Pushed at: almost 4 years ago - Stars: 1 - Forks: 0
tkoppop/ClearSyncIssues-on-Outlook
A script paired with batch to clear server sync failures from your outlook desktop application.
Language: PowerShell - Size: 14.6 KB - Last synced at: about 2 years ago - Pushed at: almost 4 years ago - Stars: 1 - Forks: 0
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.
Language: Jupyter Notebook - Size: 70.3 KB - Last synced at: about 1 year ago - Pushed at: almost 4 years ago - Stars: 0 - Forks: 0
jonschlinkert/conflicts
Detects when a new file is different than an existing file and prompts the user for action.
Language: JavaScript - Size: 421 KB - Last synced at: 6 days ago - Pushed at: over 6 years ago - Stars: 6 - Forks: 1
mpawlow/couchdb-conflict-remover
A Python application that scans and removes all document conflicts from a CouchDB / Cloudant database
Language: Python - Size: 57.6 KB - Last synced at: about 2 years ago - Pushed at: about 4 years ago - Stars: 1 - Forks: 0
JoeSwinehart/DataVizLab3
Lab 3 -- EDLD 652
Language: HTML - Size: 8.17 MB - Last synced at: almost 2 years ago - Pushed at: about 4 years ago - Stars: 0 - Forks: 0
janole/merge-conflicts
Show merge conflicts between two branches
Language: JavaScript - Size: 16.6 KB - Last synced at: 25 days ago - Pushed at: over 4 years ago - Stars: 0 - Forks: 0
mihneadb/find-conflicting-branches
An easy way to find those annoying conflicting branches
Language: Python - Size: 4.88 KB - Last synced at: 23 days ago - Pushed at: over 1 year ago - Stars: 4 - Forks: 0
LoLei/tug-overlap-checker
Check for course overlaps at Graz University of Technology
Language: Python - Size: 23.4 KB - Last synced at: about 1 year ago - Pushed at: about 5 years ago - Stars: 1 - Forks: 0
lfre/spotter
Spots potential merge conflicts between open Pull Requests
Size: 1000 Bytes - Last synced at: 2 months ago - Pushed at: about 6 years ago - Stars: 0 - Forks: 0
rimiti/pbxproj-merger
CLI tool to resolve your .pbxproj conflicts
Language: Go - Size: 17.6 KB - Last synced at: 2 months ago - Pushed at: about 7 years ago - Stars: 1 - Forks: 0
mentionbenjamin/git-branches-merges-conflicts
Experimenting with Git branches/merges/conflicts. Collaboration with Can Toraman
Size: 1.95 KB - Last synced at: about 2 years ago - Pushed at: almost 7 years ago - Stars: 0 - Forks: 0
motet-a/merge-matrix
Web service displaying conflicts between PRs
Language: JavaScript - Size: 54.7 KB - Last synced at: about 2 years ago - Pushed at: over 7 years ago - Stars: 3 - Forks: 0
