conflict-resolution

There are 0 repository under conflict-resolution topic.

• mkchoi212 / fac

  Easy-to-use CUI for fixing git conflicts

  command-lineconflict-resolutioncuigitgogolangutility
  Language:Go 1830

• YousefED / SyncedStore

  SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.

  crdtyjsreactive-programmingcollaborativecollaborationconflict-resolutionvuereactoffline-firstjavascriptsvelte
  Language:TypeScript 1614

• ostinelli / syn

  A scalable global Process Registry and Process Group manager for Erlang and Elixir.

  process-registryclusterpubsubconflict-resolutionprocess-grouperlangelixir-langelixir
  Language:Erlang 617

• smashwilson / merge-conflicts

  Resolve git merge conflicts in Atom

  merge-conflictsatomconflict-resolution
  Language:CoffeeScript 432

• TUDelft-CNS-ATM / bluesky

  The open source air traffic simulator

  pythontrafficaircraftsimulationair-traffic-controlair-transportconflict-detectionconflict-resolutiontransportation-simulationtransportationwgs84navaidstudelftdronesuspaceutmurban-air-mobility
  Language:Python 326
• CloudOnce

  CloudOnce / CloudOnce

  Unified Game Services API for Unity

  unity3dgame-servicesgame-centeriosandroidtvosgoogle-play-game-servicesgoogle-play-gamesunified-apiachievementsleaderboardscloud-savecloud-storageunityconflict-resolution
  Language:C# 248

• orbitdb-archive / crdts

  A library of Conflict-Free Replicated Data Types for JavaScript

  conflict-resolutioncrdtcrdtsdata-structuresdistributedp2p
  Language:JavaScript 214

• peer-base / js-delta-crdts

  Delta State-based CRDTs in Javascript

  crdtcrdtsconflict-resolutionoffline-firstjavascripteventually-consistent
  Language:JavaScript 191

• dschrempf / syncthing-resolve-conflicts

  A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.

  syncthingconflict-resolution
  Language:Shell 81

• deltadoc / text_delta

  Elixir counter-part of the Quill.js Delta library. Provides a baseline for Operational Transformation of rich text.

  deltaoperational-transformationdifftextrich-textchangeselixirevent-sourcingconflict-resolutioncollaboration
  Language:Elixir 66

• jakub-g / git-resolve-conflict

  :heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

  conflict-resolutionconflicting-changesgitgit-mergetoolsmerge-conflictsresolve-conflicts
  Language:Shell 51

• sascha-wolf / sublime-GitConflictResolver

  A little plugin to help you resolving this nasty conflicts.

  conflict-resolutiongitgit-conflict-resolvergit-conflictshacktoberfestsublime-textsublime-text-3sublime-text-3-packagesublime-text-package
  Language:Python 44

• xgouchet / AutoMergeTool

  Half automatic merge toolchain for git

  git-mergetoolsgitconflict-resolutionhacktoberfesthacktoberfest2020pythonhacktoberfest2021
  Language:Python 43

• sola-da / ConflictJS

  Finding and Understanding Conflicts Between JavaScript Libraries

  librariesconflict-resolutionjavascriptjavascript-library
  Language:JavaScript 40

• stas-sl / realtime-collaboration-resources

  List of resources related to realtime collaboration

  crdtoperational-transformationsynchronizationofflineconflict-resolution
  30

• liaojinxing / ConflictResolver

  An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.

  conflict-resolutionmerge-conflictsxcodexcode-source-editor-extension
  Language:Swift 25

• cinaq / mendix-userlib-cleaner

  A simple CLI tool that identifies duplicate JARS in a directory. It can remove them also if desired.

  javamendixdeveloper-toolsconflict-resolution
  Language:Go 21

• se-sic / jdime

  syntactic merge tool for java

  structured-mergesemistructured-mergeextendjjavamergingmergeconflict-resolutionrevision-control
  Language:Java 20

• XuShenLZ / conflict_rez

  Conflict resolution for multiple vehicles in tight spaces

  conflict-resolutionoptimal-controlreinforcement-learningtrajectory-planning
  Language:Python 15

• ConFooBio / gmse

  An R package for simulating Generalised Management Strategy Evaluation

  management-strategy-evaluationmanagement-decisionsadaptive-managementgame-theorypopulation-modelwildlife-managementconservationecological-modellingecological-modelsecologyconflictconflict-resolutiongenetic-algorithmgenetic-algorithmsr-packagefood-securityagricultural-modellingsimulation
  Language:TeX 10

• bauyrzhanospan / VirtualAssistant

  Virtual Assistant project done in the Middlesex University with Dr. Nawaz Khan by scholarship of the ErasmusPlus program.

  annpythonflaskassistantassistive-technologygoogle-apineural-networkmachine-learningfeedforward-neural-networkflask-applicationflask-webclassificationvirtual-assistantcbrcase-basedconflict-resolutionvirtualdialoguespeech-recognitionexpert
  Language:Python 7

• thufv / automerge

  Resolve conflicts via version space algebra in structured merge.

  merge-conflictsmergerstructured-mergejavaconflict-resolutionversion-space-algebraprogram-synthesis
  Language:Java 7

• conflict-AI / conflictwiki

  🕸️ Code and data accompanying the EMNLP 2021 paper “Classifying Dyads for Militarized Conflict Analysis”

  wikipedianatural-language-processingdatasetwikidataconflict-resolutionsocial-sciencesgnn
  Language:Jupyter Notebook 6

• JanisZhang / PR-conflicts-alert

  Github app: Alerts authors on PR conflicts

  github-appmanagementopen-sourcequarkusalertconflict-resolutionpull-requests
  Language:Java 5

• MuNuChapterHKN / GitMasterclass

  This repository contain the source code of the 2023 second edition of the HKN Masterclass from IEEE-HKN Mu Nu Chapter in Politecnico di Torino.

  conflict-resolutiongitgithubissuespull-request
  Language:Python 5

• wbsg-uni-mannheim / winter

  WInte.r is a Java framework for end-to-end data integration. The WInte.r framework implements well-known methods for data pre-processing, schema matching, identity resolution, data fusion, and result evaluation.

  conflict-resolutionconflict-resolverdata-fusiondata-matchingdeduplicationentity-matchingentity-resolutionlink-discovery
  Language:Java 5

• marcluque / YASER

  Yet Another Sat solvER

  smtsmt-solversat-solversattheory-solversatisfiabilityformal-verificationsolverdpll-algorithmdpll-solverresolution-proofconflict-resolutioncdcl-algorithmconflict-driven-clause-learningconflict-based-searchfirst-order-logicpropositional-logicpropositional-resolutionsatisfiability-modulo-theoriesbacktracking-search
  Language:C 4

• namoscato / resolve-composer-conflict

  Utility to automatically resolve composer.lock git conflicts

  composerconflictconflict-resolutiongitgit-conflictsresolver
  Language:JavaScript 4

• RomainLITUD / conflict_resolution_dataset

  Conflict resolution dataset

  autonomous-vehiclesconflict-resolutiontrajectory-dataset
  4

• ddan4 / Gravity-DAO-INFO

  Clone https://github.com/commonsbuild/graviton-training - Resources from Gravity DAO - Conflict management for Decentralized Organizations

  daoconflict-resolutiondecentralized-auto-orgnonviolent-communication
  3

• kiprasmel / git-diff3c

  diff 3-way conflicts — solve merge conflicts fast

  conflict-resolutiongit
  Language:JavaScript 3

• ottopecz / talentcomposer

  Software composition tool using talents

  composing-talentsconflict-resolutiontalent
  Language:JavaScript 3

• carpentries / github-skill-up-maintainers

  A GitHub skill-up for lesson Maintainers and developers

  branchconflictconflict-resolutionissueslabellingmergepull-requestsrebasereferencing
  Language:Python 2

• csirmaz / algebraic-reconciler

  How to Syncronize Many Filesystems in Near Linear Time? Prototype code for a data synchronizer introduced in https://arxiv.org/abs/2302.09666 (Python)

  cloudconflict-resolutiondata-synchronizationfilesystemsynchronization
  Language:Python 2

• JesusFerVid-ACN / MergeTesting

  Explica con ejemplos los conceptos de de Merge, Rebase, Pull Request y Stash.

  cliconflictconflict-resolutiongitmergepull-requestrebasestashvscode
  Language:CSS 2

• WebDevYCH / challenge-git

  This challenge will test your understanding of a basic codebase and your ability to use git rebase properly.

  conflict-resolutiongithubrebase
  Language:JavaScript 2