GitHub 中文社区
回车: Github搜索    Shift+回车: Google搜索
论坛
排行榜
趋势
登录

©2025 GitHub中文社区论坛GitHub官网网站地图GitHub官方翻译

  • X iconGitHub on X
  • Facebook iconGitHub on Facebook
  • Linkedin iconGitHub on LinkedIn
  • YouTube iconGitHub on YouTube
  • Twitch iconGitHub on Twitch
  • TikTok iconGitHub on TikTok
  • GitHub markGitHub’s organization on GitHub
集合主题趋势排行榜
#

conflict-resolution

Website
Wikipedia
https://static.github-zh.com/github_avatars/mkchoi212?size=40
mkchoi212 / fac

Easy-to-use CUI for fixing git conflicts

GoGitcuiconflict-resolutionUtility Software命令行界面
Go 1.85 k
1 年前
https://static.github-zh.com/github_avatars/YousefED?size=40
YousefED / SyncedStore

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

crdtyjsreactive-programmingcollaborativecollaborationconflict-resolutionVue.jsReactoffline-firstJavaScriptSvelte
TypeScript 1.82 k
1 年前
https://static.github-zh.com/github_avatars/ostinelli?size=40
ostinelli / syn

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

clusterPublish-subscribe patternconflict-resolutionErlangelixir-langElixir
Erlang 654
10 个月前
https://static.github-zh.com/github_avatars/TUDelft-CNS-ATM?size=40
TUDelft-CNS-ATM / bluesky

The open source air traffic simulator

PythontrafficaircraftSimulationconflict-resolutionwgs84dronesutm
Python 431
5 天前
https://static.github-zh.com/github_avatars/smashwilson?size=40
smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

merge-conflictsAtomconflict-resolution
CoffeeScript 431
8 年前
https://static.github-zh.com/github_avatars/CloudOnce?size=40
CloudOnce / CloudOnce

#安卓#Unified Game Services API for Unity

UnityiOSAndroidtvOSunified-apiachievementscloud-storageconflict-resolution
C# 252
2 年前
https://static.github-zh.com/github_avatars/orbitdb-archive?size=40
orbitdb-archive / crdts

A library of Conflict-Free Replicated Data Types for JavaScript

crdtcrdtsconflict-resolution数据结构P2Pdistributed
JavaScript 215
2 年前
https://static.github-zh.com/github_avatars/peer-base?size=40
peer-base / js-delta-crdts

Delta State-based CRDTs in Javascript

crdtcrdtsconflict-resolutionoffline-firstJavaScripteventually-consistent
JavaScript 197
6 年前
https://static.github-zh.com/github_avatars/dschrempf?size=40
dschrempf / syncthing-resolve-conflicts

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

conflict-resolution
Shell 97
2 个月前
https://static.github-zh.com/github_avatars/deltadoc?size=40
deltadoc / text_delta

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

deltadifftextrich-textchangesElixirevent-sourcingconflict-resolutioncollaboration
Elixir 68
7 年前
https://static.github-zh.com/github_avatars/jakub-g?size=40
jakub-g / git-resolve-conflict

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

Gitmerge-conflictsconflict-resolution
Shell 52
5 个月前
https://static.github-zh.com/github_avatars/sascha-wolf?size=40
sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.

Gitconflict-resolutionSublime TextHacktoberfest
Python 44
9 年前
https://static.github-zh.com/github_avatars/xgouchet?size=40
xgouchet / AutoMergeTool

Half automatic merge toolchain for git

Gitconflict-resolutionHacktoberfesthacktoberfest2020Pythonhacktoberfest2021
Python 42
5 年前
https://static.github-zh.com/github_avatars/sola-da?size=40
sola-da / ConflictJS

Finding and Understanding Conflicts Between JavaScript Libraries

Libraryconflict-resolutionJavaScriptjavascript-library
JavaScript 40
3 年前
https://static.github-zh.com/github_avatars/stas-sl?size=40
stas-sl / realtime-collaboration-resources

List of resources related to realtime collaboration

crdtsynchronizationofflineconflict-resolution
31
3 年前
https://static.github-zh.com/github_avatars/liaojinxing?size=40
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 ...

Xcodemerge-conflictsconflict-resolution
Swift 25
7 年前
https://static.github-zh.com/github_avatars/cinaq?size=40
cinaq / mendix-userlib-cleaner

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

Javadeveloper-toolsconflict-resolution
Go 23
7 个月前
https://static.github-zh.com/github_avatars/se-sic?size=40
se-sic / jdime

syntactic merge tool for java

Javamergeconflict-resolution
Java 20
1 年前
https://static.github-zh.com/github_avatars/XuShenLZ?size=40
XuShenLZ / conflict_rez

Conflict resolution for multiple vehicles in tight spaces

conflict-resolutionoptimal-controlreinforcement-learning
Python 20
9 个月前
https://static.github-zh.com/github_avatars/ConFooBio?size=40
ConFooBio / gmse

An R package for simulating Generalised Management Strategy Evaluation

game-theoryecologyconflict-resolutiongenetic-algorithmr-packageSimulation
TeX 10
1 年前
loading...