Lib.rs

› Keywords #merge-conflicts #git #merge #storage-collection #calimero #logging

#conflict

  1. calimero-storage

    Core Calimero infrastructure and tools

    v0.10.0-rc.47 #crdt #storage-layer #conflict #calimero #distributed-applications #storage-collection #merge-conflicts #logging #optional-fields

  2. pumpkin-conflict-resolvers

    The conflict resolvers of the Pumpkin constraint programming solver

    v0.3.0 #pumpkin #constraint-programming #solver #conflict #resolver #cp #lazy-evaluation

  3. filestatrec

    record mtime and mode for files in a git repository

    v0.0.11 #mtime #git-repository #record #mode #conflict #merge-conflicts #text-file #git-tree #git-merge

  4. clash-sh

    Avoid merge conflicts across git worktrees for parallel AI coding agents

    v0.2.0 #merge-conflicts #git #conflict #git-worktree #merge

  5. threeway_merge

    Git-style 3-way string merging using proven algorithms from libgit2/xdiff. Statically links xdiff (LGPL-2.1+).

    v0.1.15 #merge-diff #git #conflict #git-merge #text

  6. merge-engine

    A non-LLM merge conflict resolver using structured merge, Version Space Algebra, and search-based techniques

    v0.1.0 #git-merge #git #diff3 #conflict #merge

  7. stout-resolve

    Dependency resolution for stout

    v0.2.0 #dependency-resolution #topological-sorting #stout #detect #conflict

  8. resolvething

    A CLI tool to resolve syncthing conflicts and duplicate files

    v0.6.0 #syncthing #conflict #duplicates

  9. confsolve

    Command line tool for resolving Dropbox/Wuala conflicts

    v0.3.0 #command-line-tool #conflict #file-sync #dropbox #resolving

  10. fiber-for-wasmedge

    Wasmtime Fiber for WasmEdge

    v14.0.4 410 #wasm-edge #wasmtime #fibers #solve #conflict #wasm-runtime

  11. tlfs-api

    tlfs api

    v0.1.0 #sdk #local-first #tlfs #conflict #api #encryption #shared-data #user-data

  12. shrink-conflicts

    Tries to minimise diff3-style git conflicts

    v0.1.0 #conflict #git #minimise #shrink #tries #text-editors

  13. mogul

    Agnosticly helps to manage concurrent versions of things

    v0.2.0 130 #manage #concurrency #conflict #versions

  14. alloc-ext

    Useful extensions to alloc library

    v0.1.1 #extension #alloc #name #conflict #module #dependency-free #mirrored #suffixed #enhance

    15. Try searching with DuckDuckGo.

  15. regrate

    Better migrations using hashes for names instead of serial numbers or dates

    v0.3.0 #migration #hash #name #conflict #merge-conflicts #date #pre-commit-hooks

  16. fake-temp-openmw-package

    A command line tool for manipulating files related to OpenMW

    v0.2.0 #command-line-tool #open-mw #dds #conflict #dimension

  17. syncthing-task-resolve

    Resolve syncthing conflicts for taskwarrior databases

    v0.1.0 #taskwarrior #conflict #syncthing #sqlite #syncing #database #taskchampion