-
Updated
Aug 29, 2016
conflict-resolution
Here are 78 public repositories matching this topic...
A little plugin to help you resolving this nasty conflicts.
-
Updated
Nov 18, 2016 - Python
Resolve git merge conflicts in Atom
-
Updated
May 16, 2017 - CoffeeScript
Operational transform example with Quill and Delta
-
Updated
Jun 21, 2017 - JavaScript
Virtual Assistant project done in the Middlesex University with Dr. Nawaz Khan by scholarship of the ErasmusPlus program.
-
Updated
Jan 30, 2018 - Python
-
Updated
Jan 30, 2018 - Java
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
Ruby 💎 tool for resolving conflicts in `db/structure.sql`
-
Updated
Apr 4, 2018 - Ruby
Elixir counter-part of the Quill.js Delta library. Provides a baseline for Operational Transformation of rich text.
-
Updated
Jun 9, 2018 - Elixir
-
Updated
Aug 2, 2018 - Java
Resolve conflicts via version space algebra in structured merge.
-
Updated
Nov 10, 2018 - Java
Synced todo list with peerjs (http only)
-
Updated
May 31, 2019 - HTML
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
-
Updated
Sep 27, 2019 - Vim Script
Delta State-based CRDTs in Javascript
-
Updated
Nov 26, 2019 - JavaScript
A tool to help resolve file conflicts in syncthing.
-
Updated
Dec 19, 2019 - Python
Sample code that demonstrates NuGet version conflicts within one solution.
-
Updated
Jan 9, 2024 - C#
Half automatic merge toolchain for git
-
Updated
Jun 25, 2020 - Python
Vim Conflict Sleuth: Examine 3-way merge conflicts in multiple tabs in Vim
-
Updated
Aug 1, 2020 - Vim Script
API to get maximum movies which an actor can sign without date conflicts using Flask and C++
-
Updated
Mar 20, 2021 - Python
Improve this page
Add a description, image, and links to the conflict-resolution topic page so that developers can more easily learn about it.
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."