Ecosyste.ms: Repos

An open API service providing repository metadata for many open source software ecosystems.

GitHub topics: conflict-resolution

Repositories

it-at-m/kobit-backend

Conflict Resolution Web Application for government organisations and businesses

Language: Java - Size: 307 KB - Last synced: about 1 hour ago - Pushed: 1 day ago - Stars: 1 - Forks: 0

CloudOnce/CloudOnce

Unified Game Services API for Unity

Language: C# - Size: 278 MB - Last synced: about 6 hours ago - Pushed: 10 months ago - Stars: 249 - Forks: 48

TUDelft-CNS-ATM/bluesky

The open source air traffic simulator

Language: Python - Size: 125 MB - Last synced: 6 days ago - Pushed: about 2 months ago - Stars: 333 - Forks: 236

ostinelli/syn

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

Language: Erlang - Size: 1.57 MB - Last synced: 8 days ago - Pushed: about 1 month ago - Stars: 618 - Forks: 74

kiprasmel/git-diff3c

diff 3-way conflicts — solve merge conflicts fast

Language: JavaScript - Size: 10.7 KB - Last synced: 14 days ago - Pushed: about 1 year ago - Stars: 4 - Forks: 0

HiConfiT/hiconfit-core

A set of Maven-based libraries for High-Performance Knowledge Based Configuration Techniques

Language: Perl - Size: 4.79 MB - Last synced: 16 days ago - Pushed: 17 days ago - Stars: 0 - Forks: 0

mkchoi212/fac

Easy-to-use CUI for fixing git conflicts

Language: Go - Size: 1.42 MB - Last synced: 10 days ago - Pushed: 5 months ago - Stars: 1,832 - Forks: 51

it-at-m/kobit-frontend

Conflict Resolution Web Application for government organisations and businesses

Language: Vue - Size: 2.98 MB - Last synced: about 4 hours ago - Pushed: 1 day ago - Stars: 2 - Forks: 0

XylotrupesGideon/B.-Gideon-Bergheim-public-CV

Thank you for your interest in my public CV. Feel free to contact me with any additional questions

Size: 6.4 MB - Last synced: 21 days ago - Pushed: 21 days ago - Stars: 0 - Forks: 0

orbitdb-archive/crdts 📦

A library of Conflict-Free Replicated Data Types for JavaScript

Language: JavaScript - Size: 166 KB - Last synced: 3 days ago - Pushed: about 1 year ago - Stars: 215 - Forks: 16

pv-hernandez/conflict-juggler.nvim

A tool to simplify merge conflicts in Neovim

Language: Lua - Size: 14.6 KB - Last synced: about 1 month ago - Pushed: about 1 month ago - Stars: 0 - Forks: 0

mGunawardhana/how-to-review-pull-requests

All great projects start with collaboration. Pull requests are the foundation of teamwork on GitHub — and pull request reviews give you the ability to work together and discuss changes specific to a pull request by commenting, requesting changes, or approving.

Language: HTML - Size: 21.5 KB - Last synced: about 1 month ago - Pushed: about 1 month ago - Stars: 0 - Forks: 0

YousefED/SyncedStore

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

Language: TypeScript - Size: 14.6 MB - Last synced: about 1 month ago - Pushed: 2 months ago - Stars: 1,610 - Forks: 50

XuShenLZ/conflict_rez

Conflict resolution for multiple vehicles in tight spaces

Language: Python - Size: 5.19 MB - Last synced: 10 days ago - Pushed: 10 days ago - Stars: 15 - Forks: 1

peer-base/js-delta-crdts

Delta State-based CRDTs in Javascript

Language: JavaScript - Size: 116 KB - Last synced: about 1 month ago - Pushed: over 4 years ago - Stars: 191 - Forks: 16

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)

Language: Shell - Size: 31.3 KB - Last synced: 6 days ago - Pushed: over 1 year ago - Stars: 51 - Forks: 11

diffblue/git-format-merge Fork of emilio/clang-format-merge

A git merge driver for google-java-format.

Language: Shell - Size: 10.7 KB - Last synced: about 2 months ago - Pushed: about 3 years ago - Stars: 0 - Forks: 0

ConFooBio/gmse

An R package for simulating Generalised Management Strategy Evaluation

Language: TeX - Size: 283 MB - Last synced: about 2 months ago - Pushed: about 2 months ago - Stars: 10 - Forks: 5

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.

Language: Swift - Size: 28 MB - Last synced: 29 days ago - Pushed: about 6 years ago - Stars: 25 - Forks: 1

RomainLITUD/conflict_resolution_dataset

Conflict resolution dataset

Size: 254 KB - Last synced: 2 months ago - Pushed: 2 months ago - Stars: 5 - Forks: 0

cinaq/mendix-userlib-cleaner

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

Language: Go - Size: 13.3 MB - Last synced: about 2 months ago - Pushed: over 1 year ago - Stars: 21 - Forks: 5

conflict-AI/conflictwiki

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

Language: Jupyter Notebook - Size: 25.7 MB - Last synced: 3 months ago - Pushed: 3 months ago - Stars: 6 - Forks: 1

Inc44/TheSync

This Python script is designed to synchronize files between a source directory and a destination directory. It's implemented in a single file to simplify deployment and usage.

Language: Python - Size: 69.3 KB - Last synced: 3 months ago - Pushed: 3 months ago - Stars: 1 - Forks: 0

myklob/ideastockexchange

Empowering Rational Discourse and Decision-Making: The Idea Stock Exchange is a groundbreaking platform designed to revolutionize how we engage in political and societal debates. At its core, this project harnesses the power of collective intelligence, utilizing a structured framework for automated conflict resolution and cost-benefit analysis.

Size: 4.41 MB - Last synced: 2 months ago - Pushed: 2 months ago - Stars: 1 - Forks: 1

deltadoc/text_delta

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

Language: Elixir - Size: 176 KB - Last synced: 28 days ago - Pushed: almost 6 years ago - Stars: 66 - Forks: 8

marcluque/YASER

Yet Another Sat solvER

Language: C - Size: 23.9 MB - Last synced: 4 months ago - Pushed: 4 months ago - Stars: 3 - Forks: 0

jaqarrick/yjs-lab

Learn about the Yjs CRDT implementation and see it action with a demo

Size: 2.95 MB - Last synced: about 1 month ago - Pushed: about 3 years ago - Stars: 1 - Forks: 0

JanisZhang/PR-conflicts-alert

Github app: Alerts authors on PR conflicts

Language: Java - Size: 35.2 KB - Last synced: 5 months ago - Pushed: 5 months ago - Stars: 3 - Forks: 0

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.

Language: Python - Size: 2.03 MB - Last synced: 5 months ago - Pushed: 5 months ago - Stars: 5 - Forks: 29

xgouchet/AutoMergeTool

Half automatic merge toolchain for git

Language: Python - Size: 177 KB - Last synced: 29 days ago - Pushed: almost 4 years ago - Stars: 43 - Forks: 4

m-housni/GitLogMonitor

I created this tool to help reducing and resolving merge conflicts at early stages by monitoring the git logs at a regular laps of time. Feel free to improve the functionnality, PRs are welcomed!

Language: C - Size: 6.84 KB - Last synced: 4 months ago - Pushed: 6 months ago - Stars: 0 - Forks: 0

stas-sl/realtime-collaboration-resources

List of resources related to realtime collaboration

Size: 17.6 KB - Last synced: about 1 month ago - Pushed: about 2 years ago - Stars: 30 - Forks: 1

jojobaseedoil/MINs

This is a Multistage Interconnection Network (MIN) conflict solver using a heuristic approach

Language: C++ - Size: 37.1 KB - Last synced: 6 months ago - Pushed: 6 months ago - Stars: 0 - Forks: 0

se-sic/jdime

syntactic merge tool for java

Language: Java - Size: 50.6 MB - Last synced: 7 months ago - Pushed: 7 months ago - Stars: 19 - Forks: 13

smashwilson/merge-conflicts 📦

Resolve git merge conflicts in Atom

Language: CoffeeScript - Size: 5.26 MB - Last synced: 14 days ago - Pushed: almost 7 years ago - Stars: 432 - Forks: 42

carpentries/github-skill-up-maintainers

A GitHub skill-up for lesson Maintainers and developers

Language: Python - Size: 2.18 MB - Last synced: 1 day ago - Pushed: 2 days ago - Stars: 2 - Forks: 2

thufv/automerge

Resolve conflicts via version space algebra in structured merge.

Language: Java - Size: 14.8 MB - Last synced: 3 days ago - Pushed: over 5 years ago - Stars: 7 - Forks: 2

manleviet/CA-CDR 📦

Consistency-based Algorithms for Conflict Detection and Resolution

Language: Java - Size: 167 KB - Last synced: 9 months ago - Pushed: almost 2 years ago - Stars: 0 - Forks: 0

ananthrn/Escape Fork of Jumhyn/coms4444-problem1

Language: Java - Size: 35.2 KB - Last synced: 9 months ago - Pushed: almost 6 years ago - Stars: 0 - Forks: 0

jsit/conflict-sleuth.vim

Vim Conflict Sleuth: Examine 3-way merge conflicts in multiple tabs in Vim

Language: Vim script - Size: 2.93 KB - Last synced: 10 months ago - Pushed: almost 4 years ago - Stars: 0 - Forks: 0

TaleLearnCode/SecretsOfConflictResolution

Conflict within your team is inevitable. Come learn how to deal with this conflict so it doesn't tear apart your team.

Size: 385 MB - Last synced: 11 months ago - Pushed: 11 months ago - Stars: 0 - Forks: 0

sola-da/ConflictJS

Finding and Understanding Conflicts Between JavaScript Libraries

Language: JavaScript - Size: 375 MB - Last synced: 9 months ago - Pushed: over 2 years ago - Stars: 40 - Forks: 4

xavierw39/Colombia-Conflict-Analysis

In Colombia, the conflicts among government, far-left guerrillas, and far-right paramilitaries are deeply rooted in the country's modern history. In 2016 after a failed peace referendum, the country again entered instability until today. With ACLED conflict data this Tableau data story provides an overview of the conflicts through various aspects.

Size: 4.76 MB - Last synced: about 1 year ago - Pushed: about 1 year ago - Stars: 0 - Forks: 0

Brian-Lookabaugh/UN-PKOs-Project

Repository for "The Economic Consequences of UN Peacekeeping Operations: Causal Analysis for Conflict Management and Peace Research"

Language: R - Size: 43.6 MB - Last synced: about 1 year ago - Pushed: about 1 year ago - Stars: 0 - Forks: 0

certified-draco/alx-pre_course

I'm now a ALX Student, this is my first repository as a full-stack engineer.

Size: 11.7 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 2 - Forks: 0

Brian-Lookabaugh/Peace-Agreements-Project

A project using the tools of causal inference to estimate the causal effects of peace agreements on levels of violence.

Language: R - Size: 22.1 MB - Last synced: about 1 year ago - Pushed: about 1 year ago - Stars: 0 - Forks: 0

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)

Language: Python - Size: 105 KB - Last synced: 10 months ago - Pushed: about 1 year ago - Stars: 1 - Forks: 0

dschrempf/syncthing-resolve-conflicts

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

Language: Shell - Size: 28.3 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 62 - Forks: 13

Nkaleth/Capstone2_art

This JavaScript capstone project is about building a web application based on an external API. We selected an API from a Museum that provides data about paintings and then we build the webapp around it. This webapp will have 3 user interfaces.

Language: JavaScript - Size: 1.18 MB - Last synced: about 1 year ago - Pushed: about 1 year ago - Stars: 0 - Forks: 0

junkblocker/syncthing-resolve-conflicts Fork of dschrempf/syncthing-resolve-conflicts

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

Language: Shell - Size: 34.2 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 1 - Forks: 0

ddan4/Gravity-DAO-INFO

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

Size: 24.1 MB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 2 - Forks: 1

wbsg-uni-mannheim/winter Fork of olehmberg/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.

Language: Java - Size: 18.6 MB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 4 - Forks: 1