conflicts

There are 0 repository under conflicts topic.

r-lib / conflicted
An alternative conflict resolution strategy for R
conflicts r
Language:R 246
MerginMaps / geodiff
Library for handling diffs for geospatial data
conflicts diff geopackage gis handling-diffs merginmaps
Language:Python 150
DigiLive / jQuery-Merge-for-php-diff
A client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.
diff javascript jquery merge conflicts
Language:JavaScript 74
hzdavid / findConflicts
一款查找Jar/类/日志/版本冲突的Maven插件(a maven plugin to find the conflicts of maven project)
java maven conflicts jarconflicts classconflicts log logconflicts
Language:Java 39
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.
conflict conflicts dirent duplicate file filename filepath fs increment javascript jonschlinkert name node nodejs path rename
Language:JavaScript 22
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.
conflicts dirent duplicate file filename filepath increment javascript jonschlinkert name node nodejs number path rename strip vinyl
Language:JavaScript 9
label-merge-conflicts-action
prince-chrismc / label-merge-conflicts-action
GitHub Action to automatically label PRs with merge conflicts
github github-actions github-api labels conflicts pull-request pull-requests
Language:TypeScript 9
emosheeep / lockfile-conflicts
A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.
cli conflicts cooperation git infra lockfile merge merge-driver monorepo pnpm rebase workflow automerge
Language:TypeScript 8
insurgent-dynamics
csaladenes / insurgent-dynamics
A hybrid system dynamics-time series method for conflict analysis using GDELT
system-dynamics gdelt gdelt-events gdelt-data time-series-analysis time-series insurgency conflict-analysis conflicts timeline matlab python exploratorium
Language:Jupyter Notebook 7
icub-tech-iit / how-to-solve-pull-rebase-conflicts
Test repository showing how to resolve conflicts happening during a `git pull --rebase`
git rebase merge conflicts tutorial how-to guide
7
warrickct / unity-scene-merging-guide
Just a quick guide on how to set up scene merging for unity.
git unity scene merging unityyamlmerge tutorial guide conflicts
7
jonschlinkert / conflicts
Detects when a new file is different than an existing file and prompts the user for action.
conflict conflicts file fs detect prompt write file-system node nodejs javascript jonschlinkert vinyl gulp files
Language:JavaScript 6
yungvldai / reshala
CLI tool to resolve package.json merge conflicts 🤝
git conflicts package-json npm resolve lerna cli merge
Language:JavaScript 5
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.
apache maven continuous-integration continuous-deployment continuous-delivery teamcity bamboo java jenkins agile pull-requests conflicts apache-maven
Language:Java 4
jonschlinkert / gulp-conflicts
Detects when a file to be written is different than an existing file and, if necessary, prompts the user for action.
conflicts gulp gulpplugin through files conflict detect prompt stream node nodejs javascript
Language:JavaScript 4
mihneadb / find-conflicting-branches
An easy way to find those annoying conflicting branches
git conflict-detection conflicts branch
Language:Python 4
martinstarman / mersge
Simple 3-way merge editor for the terminal
conflict conflicts console git merge terminal rust rust-lang
Language:Rust 3
motet-a / merge-matrix
Web service displaying conflicts between PRs
git github conflicts
Language:JavaScript 3
tj32gm / 3-kingdoms-weather-shock
Data deposit for Extreme Weather Events and Military Conflict over Seven Centuries in Ancient Korea
climate conflicts war ancient-kingdom
3
mpawlow / couchdb-conflict-remover
A Python application that scans and removes all document conflicts from a CouchDB / Cloudant database
python python3 couchdb cloudant conflicts conflict-detection conflict-resolution database database-management
Language:Python 2
novikovadaria / Conflictology
Все работы по Конфликтологии. GeekBrains University | All works on Conflictology. GeekBrains University
conflicts geekbrains homework project-management
2
tkoppop / ClearSyncIssues-on-Outlook
A script paired with batch to clear server sync failures from your outlook desktop application.
conflicts outlook local-failiures attachment azure-powershell batch-script
Language:PowerShell 2
bert2 / sabotage
💥 Toy Git client to easily provoke merge conflicts
git educational branches gui-application merging conflicts
Language:C# 1
bttgcm / sudan_acled
Interactive map of violent events in Sudan since 2019
sudan politics conflicts
Language:HTML 1
LoLei / tug-overlap-checker
Check for course overlaps at Graz University of Technology
tugraz university college conflicts graz-university python
Language:Python 1
rimiti / pbxproj-merger
CLI tool to resolve your .pbxproj conflicts
cli ios pbxproj conflicts merge merging react-native golang
Language:Go 1
Git-and-Github-Fundamentals
shahzaneer / Git-and-Github-Fundamentals
All about Git Version Controlling System and GitHub the web based git-repositories hosting platform
git github branch conflicts issues merge commits contributions gitignore log pull stash fork git-submodule insights rebase squash source-code-management
Language:HTML 1
shellscape / gulp-version-conflicts
Check for and report on module version conflicts for a package
gulp gulpjs nodejs versioning conflicts gulp-plugin gulp-tasks npm module
Language:JavaScript 1
Docmos / git-rebase-merge
Create a custom git command to perform a rebase via a merge
git-rebase conflicts conflict-resolution rebase
Language:Shell 0
gdv21 / pagina-web
treball final
conflicts geography geopolitics
Language:JavaScript 0
JoeSwinehart / DataVizLab3
Lab 3 -- EDLD 652
honey bee joins merges conflicts
Language:HTML 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.
silkroad conflict-analysis conflicts climate-data climate-models climate-variability armed-conflicts cultural-crossroads hotbed violence-data data-science datascience temperature-data rising-temperatures heat asia middle-east historical-data historical-maps history
Language:Jupyter Notebook 0
Liquizar / Git_Assignment_1
This is a Git Assignment for those who are learning Git as a beginner
conflicts git github
0
janole / merge-conflicts
Show merge conflicts between two branches
git merge conflicts conflict cicd ci-cd git-flow
Language:JavaScript
lfre / spotter
Spots potential merge conflicts between open Pull Requests
app conflicts merge
OJFord / vim-quickfix-conflicts
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
vim git conflict-resolution conflicts quickfix
Language:Vim Script

conflicts

r-lib / conflicted

MerginMaps / geodiff

DigiLive / jQuery-Merge-for-php-diff

hzdavid / findConflicts

jonschlinkert / add-filename-increment

jonschlinkert / strip-filename-increment

prince-chrismc / label-merge-conflicts-action

emosheeep / lockfile-conflicts

csaladenes / insurgent-dynamics

icub-tech-iit / how-to-solve-pull-rebase-conflicts

warrickct / unity-scene-merging-guide

jonschlinkert / conflicts

yungvldai / reshala

cedricwalter / git-branch-renamer-maven-plugin

jonschlinkert / gulp-conflicts

mihneadb / find-conflicting-branches

martinstarman / mersge

motet-a / merge-matrix

tj32gm / 3-kingdoms-weather-shock

mpawlow / couchdb-conflict-remover

novikovadaria / Conflictology

tkoppop / ClearSyncIssues-on-Outlook

bert2 / sabotage

bttgcm / sudan_acled

LoLei / tug-overlap-checker

rimiti / pbxproj-merger

shahzaneer / Git-and-Github-Fundamentals

shellscape / gulp-version-conflicts

Docmos / git-rebase-merge

gdv21 / pagina-web

JoeSwinehart / DataVizLab3

kvinne-anc / Conflict-and-Climate-Project

Liquizar / Git_Assignment_1

janole / merge-conflicts

lfre / spotter

OJFord / vim-quickfix-conflicts