The Wayback Machine - https://web.archive.org/web/20220627190257/https://github.com/topics/conflict-resolution
Here are
50 public repositories
matching this topic...
Easy-to-use CUI for fixing git conflicts
SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.
Updated
May 15, 2022
TypeScript
A scalable global Process Registry and Process Group manager for Erlang and Elixir.
Updated
Apr 20, 2022
Erlang
Resolve git merge conflicts in Atom
Updated
May 16, 2017
CoffeeScript
Unified Game Services API for Unity
The open source air traffic simulator
Updated
Jun 24, 2022
Python
Delta State-based CRDTs in Javascript
Updated
Nov 26, 2019
JavaScript
A library of Conflict-Free Replicated Data Types for JavaScript
Updated
May 7, 2021
JavaScript
Elixir counter-part of the Quill.js Delta library. Provides a baseline for Operational Transformation of rich text.
Updated
Jun 9, 2018
Elixir
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
Updated
Feb 23, 2020
Shell
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Updated
Feb 15, 2022
Shell
Half automatic merge toolchain for git
Updated
Jun 25, 2020
Python
A little plugin to help you resolving this nasty conflicts.
Updated
Nov 18, 2016
Python
Finding and Understanding Conflicts Between JavaScript Libraries
Updated
Jan 17, 2022
JavaScript
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.
Updated
Mar 10, 2018
Swift
List of resources related to realtime collaboration
syntactic merge tool for java
Updated
Mar 11, 2022
Java
A simple CLI tool that identifies duplicate JARS in a directory. It can remove them also if desired.
An R package for simulating Generalised Management Strategy Evaluation
Resolve conflicts via version space algebra in structured merge.
Updated
Nov 10, 2018
Java
Virtual Assistant project done in the Middlesex University with Dr. Nawaz Khan by scholarship of the ErasmusPlus program.
Updated
Jan 30, 2018
Python
Utility to automatically resolve composer.lock git conflicts
Updated
Jun 1, 2022
JavaScript
🕸️ Code and data accompanying the EMNLP 2021 paper “Classifying Dyads for Militarized Conflict Analysis”
Updated
Sep 28, 2021
Jupyter Notebook
Software composition tool using talents
Updated
Feb 11, 2022
JavaScript
Operational transform example with Quill and Delta
Updated
Jun 21, 2017
JavaScript
A tool to help resolve file conflicts in syncthing.
Updated
Dec 19, 2019
Python
API to get maximum movies which an actor can sign without date conflicts using Flask and C++
Updated
Mar 20, 2021
Python
Updated
Jan 30, 2018
Java
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
Updated
Jun 3, 2021
Shell
Improve this page
Add a description, image, and links to the
conflict-resolution
topic page so that developers can more easily learn about it.
Curate this topic
Add this topic to your repo
To associate your repository with the
conflict-resolution
topic, visit your repo's landing page and select "manage topics."
Learn more
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session.
You signed out in another tab or window. Reload to refresh your session.