mkchoi212/fac

Easy-to-use CUI for fixing git conflicts

Language: Go - Size: 1.42 MB - Last synced at: 13 days ago - Pushed at: over 1 year ago - Stars: 1,850 - Forks: 50

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 at: 13 days ago - Pushed at: about 1 year ago - Stars: 1,806 - Forks: 57

ostinelli/syn

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

Language: Erlang - Size: 1.53 MB - Last synced at: 9 days ago - Pushed at: 8 months ago - Stars: 647 - Forks: 77

smashwilson/merge-conflicts 📦

Resolve git merge conflicts in Atom

Language: CoffeeScript - Size: 5.26 MB - Last synced at: about 22 hours ago - Pushed at: almost 8 years ago - Stars: 431 - Forks: 39

TUDelft-CNS-ATM/bluesky

The open source air traffic simulator

Language: Python - Size: 126 MB - Last synced at: 12 days ago - Pushed at: 12 days ago - Stars: 419 - Forks: 257

CloudOnce/CloudOnce

Unified Game Services API for Unity

Language: C# - Size: 278 MB - Last synced at: 5 months ago - Pushed at: almost 2 years ago - Stars: 251 - Forks: 47

orbitdb-archive/crdts 📦

A library of Conflict-Free Replicated Data Types for JavaScript

Language: JavaScript - Size: 166 KB - Last synced at: 2 days ago - Pushed at: about 2 years ago - Stars: 214 - Forks: 16

peer-base/js-delta-crdts

Delta State-based CRDTs in Javascript

Language: JavaScript - Size: 116 KB - Last synced at: 15 days ago - Pushed at: over 5 years ago - Stars: 197 - Forks: 16

dschrempf/syncthing-resolve-conflicts

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

Language: Shell - Size: 36.1 KB - Last synced at: 1 day ago - Pushed at: 11 days ago - Stars: 93 - Forks: 14

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 at: about 1 month ago - Pushed at: almost 7 years ago - Stars: 68 - Forks: 8

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: 34.2 KB - Last synced at: 7 days ago - Pushed at: 3 months ago - Stars: 52 - Forks: 10

sascha-wolf/sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.

Language: Python - Size: 432 KB - Last synced at: 2 days ago - Pushed at: over 8 years ago - Stars: 44 - Forks: 6

xgouchet/AutoMergeTool

Half automatic merge toolchain for git

Language: Python - Size: 177 KB - Last synced at: about 17 hours ago - Pushed at: almost 5 years ago - Stars: 42 - Forks: 4

sola-da/ConflictJS

Finding and Understanding Conflicts Between JavaScript Libraries

Language: JavaScript - Size: 375 MB - Last synced at: over 1 year ago - Pushed at: over 3 years ago - Stars: 40 - Forks: 4

stas-sl/realtime-collaboration-resources

List of resources related to realtime collaboration

Size: 17.6 KB - Last synced at: 18 days ago - Pushed at: about 3 years ago - Stars: 31 - Forks: 1

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 at: about 1 year ago - Pushed at: about 7 years ago - Stars: 25 - Forks: 1

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: 18.8 MB - Last synced at: 9 days ago - Pushed at: 5 months ago - Stars: 22 - Forks: 5

se-sic/jdime

syntactic merge tool for java

Language: Java - Size: 50.6 MB - Last synced at: 5 months ago - Pushed at: about 1 year ago - Stars: 20 - Forks: 15

XuShenLZ/conflict_rez

Conflict resolution for multiple vehicles in tight spaces

Language: Python - Size: 5.28 MB - Last synced at: 8 months ago - Pushed at: 8 months ago - Stars: 19 - Forks: 0

ConFooBio/gmse

An R package for simulating Generalised Management Strategy Evaluation

Language: TeX - Size: 283 MB - Last synced at: about 1 month ago - Pushed at: about 1 year ago - Stars: 10 - Forks: 5

thufv/automerge

Resolve conflicts via version space algebra in structured merge.

Language: Java - Size: 14.8 MB - Last synced at: 11 months ago - Pushed at: over 6 years ago - Stars: 7 - Forks: 2

bauyrzhanospan/VirtualAssistant

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

Language: Python - Size: 54 MB - Last synced at: 7 days ago - Pushed at: about 7 years ago - Stars: 7 - Forks: 2

RomainLITUD/conflict_resolution_dataset

Conflict resolution dataset

Size: 264 KB - Last synced at: 8 months ago - Pushed at: 8 months ago - Stars: 6 - 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 at: over 1 year ago - Pushed at: over 1 year ago - Stars: 5 - Forks: 29

kiprasmel/git-diff3c

diff 3-way conflicts — solve merge conflicts fast

Language: JavaScript - Size: 16.6 KB - Last synced at: 8 days ago - Pushed at: 3 months ago - Stars: 4 - Forks: 0

marcluque/YASER

Yet Another Sat solvER

Language: C - Size: 23.9 MB - Last synced at: 2 days ago - Pushed at: over 1 year ago - Stars: 4 - 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 at: 9 days ago - Pushed at: almost 2 years ago - Stars: 4 - Forks: 0

namoscato/resolve-composer-conflict

Utility to automatically resolve composer.lock git conflicts

Language: JavaScript - Size: 420 KB - Last synced at: 14 days ago - Pushed at: about 2 years ago - Stars: 4 - Forks: 1

ottopecz/talentcomposer

Software composition tool using talents

Language: JavaScript - Size: 378 KB - Last synced at: about 10 hours ago - Pushed at: over 2 years ago - Stars: 4 - Forks: 0

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 at: about 2 years ago - Pushed at: over 2 years ago - Stars: 4 - Forks: 1

JanisZhang/PR-conflicts-alert

Github app: Alerts authors on PR conflicts

Language: Java - Size: 35.2 KB - Last synced at: over 1 year ago - Pushed at: over 1 year ago - Stars: 3 - Forks: 0

carpentries/github-skill-up-maintainers

A GitHub skill-up for lesson Maintainers and developers

Language: Python - Size: 7.09 MB - Last synced at: 6 days ago - Pushed at: 6 days ago - Stars: 2 - Forks: 2

it-at-m/kobit-backend

Conflict Resolution Web Application for government organisations and businesses

Language: Java - Size: 320 KB - Last synced at: 1 day ago - Pushed at: 9 days ago - Stars: 2 - Forks: 2

it-at-m/kobit-frontend

Conflict Resolution Web Application for government organisations and businesses

Language: Vue - Size: 16.5 MB - Last synced at: 1 day ago - Pushed at: 10 days ago - Stars: 2 - Forks: 1

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 at: about 1 month ago - Pushed at: about 1 month ago - Stars: 2 - Forks: 1

Inc44/TheSync

Synchronize files between a source directory and a destination directory

Language: Python - Size: 69.3 KB - Last synced at: about 1 month ago - Pushed at: about 1 year ago - Stars: 2 - 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 at: about 2 years ago - Pushed at: about 2 years ago - Stars: 2 - 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 at: about 2 years ago - Pushed at: over 2 years ago - Stars: 2 - Forks: 1

WebDevYCH/challenge-git

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

Language: JavaScript - Size: 19.5 KB - Last synced at: 11 months ago - Pushed at: over 2 years ago - Stars: 2 - Forks: 0

alpha74/profitMoviesAPI

API to get maximum movies which an actor can sign without date conflicts using Flask and C++

Language: Python - Size: 66.4 KB - Last synced at: about 2 months ago - Pushed at: about 4 years ago - Stars: 2 - Forks: 0

4nickel/stconflict-resolver

A tool to help resolve file conflicts in syncthing.

Language: Python - Size: 16.6 KB - Last synced at: 12 months ago - Pushed at: over 5 years ago - Stars: 2 - Forks: 0

danglotb/conflict-merge-solver

Language: Java - Size: 27.3 KB - Last synced at: 2 months ago - Pushed at: about 7 years ago - Stars: 2 - Forks: 0

Dev1an/Quill-Operational-Transform

Operational transform example with Quill and Delta

Language: JavaScript - Size: 22.1 MB - Last synced at: about 1 month ago - Pushed at: almost 8 years ago - Stars: 2 - Forks: 0

pv-hernandez/conflict-juggler.nvim

A tool to simplify merge conflicts in Neovim

Language: Lua - Size: 37.1 KB - Last synced at: 3 months ago - Pushed at: 3 months ago - Stars: 1 - Forks: 0

matt-ramotar/storex

StoreX is an extension library built on top of MobileNativeFoundation/Store

Language: Kotlin - Size: 272 KB - Last synced at: 2 months ago - Pushed at: 4 months ago - Stars: 1 - Forks: 0

firesight-ai/amnesia-machine-py

Implementation of the Hypothetical Amnesia Machine (HAM)

Language: Python - Size: 23.4 KB - Last synced at: 6 months ago - Pushed at: 6 months ago - Stars: 1 - Forks: 0

firesight-ai/amnesia-machine-js

Implementation of the Hypothetical Amnesia Machine (HAM) in Javascript

Language: JavaScript - Size: 84 KB - Last synced at: 6 months ago - Pushed at: 6 months ago - Stars: 1 - Forks: 1

mclaughlinconnor/haxe-ij-merge

A port of IntelliJ's diff merging algorithm to Haxe

Language: Haxe - Size: 288 KB - Last synced at: 7 months ago - Pushed at: 7 months ago - Stars: 1 - Forks: 0

kiprasmel/git-reverse-rebase

advanced rebase operations made simple, and without merge conflicts.

Language: TypeScript - Size: 67.4 KB - Last synced at: about 2 months ago - Pushed at: 8 months ago - Stars: 1 - Forks: 0

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 at: 16 days ago - Pushed at: about 2 years ago - Stars: 1 - Forks: 1

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 at: about 2 years ago - Pushed at: about 2 years ago - Stars: 1 - Forks: 0

manuelgardon/practicaIntegradora

Práctica con Git - Intro. Informática CTD

Size: 5.86 KB - Last synced at: almost 2 years ago - Pushed at: about 3 years ago - Stars: 1 - Forks: 0

jaqarrick/yjs-lab

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

Size: 2.95 MB - Last synced at: about 1 year ago - Pushed at: about 4 years ago - Stars: 1 - Forks: 0

mpawlow/couchdb-conflict-remover

A Python application that scans and removes all document conflicts from a CouchDB / Cloudant database

Language: Python - Size: 57.6 KB - Last synced at: about 2 years ago - Pushed at: about 4 years ago - Stars: 1 - Forks: 0

genndy007/ry-git-tutorial-practice

This repository is created for practice in git commands usage.

Language: HTML - Size: 12.7 KB - Last synced at: about 1 month ago - Pushed at: about 4 years ago - Stars: 1 - Forks: 0

FranciscoReyne/World-Wars-Gnominate

Modelo conceptual y teórico de un sistema de "gnominate" para representar guerras en el mundo.

Size: 15.6 KB - Last synced at: 14 days ago - Pushed at: 15 days ago - Stars: 0 - Forks: 0

clovu/shortcat

Shortcut custody battles? We do purr-arbitration. 🐾 🐱⌨️

Size: 1.95 KB - Last synced at: 28 days ago - Pushed at: 28 days ago - Stars: 0 - 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.41 MB - Last synced at: about 1 month ago - Pushed at: about 1 month ago - Stars: 0 - Forks: 0

OfekDotan/Skyrim-Mod-Installer-SkyClimb

Skyrim Mod Installer - Seamless Mod Installation Tool

Size: 1000 Bytes - Last synced at: about 2 months ago - Pushed at: about 2 months ago - Stars: 0 - Forks: 0

wring37doberman/Skyrim-Mod-Installer-SkyClimb

Skyrim Mod Installer - Seamless Mod Installation Tool

Size: 7.81 KB - Last synced at: 2 months ago - Pushed at: 2 months ago - Stars: 0 - Forks: 0

mkstp/negotiations-semantic-analyzer

NLP-based parameterization and visualization of conversational transcripts for inference of collaborative outcomes in negotiations

Language: Python - Size: 4.3 MB - Last synced at: 2 months ago - Pushed at: 2 months ago - Stars: 0 - Forks: 0

withingbambam/Skyrim-Mod-Installer-SkyClimb

Skyrim Mod Installer - Seamless Mod Installation Tool

Size: 7.81 KB - Last synced at: 3 months ago - Pushed at: 3 months ago - Stars: 0 - Forks: 0

yairchu/git-utils

Small helpers for using git

Language: Python - Size: 32.2 KB - Last synced at: 28 days ago - Pushed at: 4 months ago - Stars: 0 - Forks: 0

HiConfiT/hiconfit-core

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

Language: Perl - Size: 4.83 MB - Last synced at: 4 months ago - Pushed at: 4 months ago - Stars: 0 - Forks: 0

Jrgil20/skills-resolve-merge-conflicts

skill: conflicts

Size: 20.5 KB - Last synced at: 21 days ago - Pushed at: 8 months ago - Stars: 0 - Forks: 0

Khalid-Nowaf/supernet

Supernet is a conflict-free CIDR Database (network store).

Language: Go - Size: 93.8 KB - Last synced at: 10 months ago - Pushed at: 10 months ago - Stars: 0 - Forks: 0

MihirModhwadiya/Internship_2023.github.io

This Project is done by me and my friends for github concepts (ie. merge, pull, branch, issue, etc. ) and basics of html, css

Language: CSS - Size: 1.1 MB - Last synced at: 11 months ago - Pushed at: 11 months 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 at: about 1 year ago - Pushed at: about 1 year ago - Stars: 0 - Forks: 0

MichaeIDietrich/DependencyVersionConflictSample

Sample code that demonstrates NuGet version conflicts within one solution.

Language: C# - Size: 6.84 KB - Last synced at: 12 days ago - Pushed at: over 1 year ago - Stars: 0 - Forks: 0

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 at: 19 days ago - Pushed at: over 1 year ago - Stars: 0 - Forks: 0

jojobaseedoil/MINs

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

Language: C++ - Size: 37.1 KB - Last synced at: over 1 year ago - Pushed at: over 1 year 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 at: almost 2 years ago - Pushed at: almost 2 years ago - Stars: 0 - Forks: 0

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 at: almost 2 years ago - Pushed at: almost 2 years ago - Stars: 0 - 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 at: almost 2 years ago - Pushed at: almost 2 years 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 at: almost 2 years ago - Pushed at: almost 2 years ago - Stars: 0 - Forks: 0

manleviet/CA-CDR 📦

Consistency-based Algorithms for Conflict Detection and Resolution

Language: Java - Size: 167 KB - Last synced at: over 1 year ago - Pushed at: almost 3 years ago - Stars: 0 - Forks: 0

krohak/LWWElementGraph

Lightweight LWWElementGraph, which uses LWWElementSet. Handles merges in a Last Write Wins Manner.

Language: Python - Size: 5.5 MB - Last synced at: 17 days ago - Pushed at: about 3 years ago - Stars: 0 - Forks: 0

iamHrithikRaj/Edna

Edna, a chatbot, provide practical advice and solutions to help resolve workplace issues such as conflict and employee dissatisfaction.

Language: Python - Size: 244 MB - Last synced at: about 2 years ago - Pushed at: over 3 years ago - Stars: 0 - Forks: 0

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 at: about 1 year ago - Pushed at: almost 4 years ago - Stars: 0 - Forks: 0

Git-Friends-FI/Destructive-Git

Destructive part for the Git Course

Size: 18.6 KB - Last synced at: almost 2 years ago - Pushed at: almost 4 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 at: about 2 months ago - Pushed at: over 4 years ago - Stars: 0 - Forks: 0

OJFord/vim-quickfix-conflicts

Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker

Language: Vim script - Size: 4.88 KB - Last synced at: 18 days ago - Pushed at: over 5 years ago - Stars: 0 - Forks: 0

thgh/synclist

Synced todo list with peerjs (http only)

Language: HTML - Size: 117 KB - Last synced at: 22 days ago - Pushed at: almost 6 years ago - Stars: 0 - Forks: 0

ananthrn/Escape Fork of Jumhyn/coms4444-problem1

Language: Java - Size: 35.2 KB - Last synced at: over 1 year ago - Pushed at: over 6 years ago - Stars: 0 - Forks: 0

JustinAiken/structure_conflict_resolver

Ruby 💎 tool for resolving conflicts in `db/structure.sql`

Language: Ruby - Size: 33.2 KB - Last synced at: 17 days ago - Pushed at: about 7 years ago - Stars: 0 - Forks: 0