Lib.rs

› Keywords #git-branch #git-commit #conflict #merge-driver #branch-merge

#git-merge

  1. 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

  2. ddt

    Useful cli tools

    v0.3.2 1.1K #git-merge #profile #merge-driver #dev-tools #instrument

  3. threeway_merge

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

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

  4. gix-cli

    A Git extension CLI tool

    v1.2.2 #git-merge #git-commit #git #squash #merge

  5. mergiraf

    A syntax-aware merge driver for Git

    v0.16.3 160 #merge-driver #tree-sitter #git-merge #git

  6. branch-party

    A CLI tool for creating and maintaining party branches - automated git branch merging for development workflows

    v0.1.1 #git-branch #branch-merge #git #git-merge #branch

  7. 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

  8. git-branchless-submit

    Supporting library for git-branchless

    v0.10.0 #git-branchless #git-workflow #git-commit #git-merge #branch

  9. git-branchless-test

    Supporting library for git-branchless

    v0.10.0 100 #git-branchless #git-workflow #commit-graph #git-commit #testing #git-merge #cache #power-user #git-rebase

  10. probranchinator

    help you analyse conflicts in git branches

    v0.3.1 #git-branch #merge-conflicts #remote-branch #git-merge #remote-repository #table-format #temp-dir #branch-merge

  11. mergereq

    CLI for Gitlab merge requests & more

    v0.2.2 #merge-request #git-merge #git #gitlab #merge

  12. git-tools

    Git subcommands to help with your workflow

    v0.1.4 180 #git-workflow #git-merge #git #rebase #try-merge

    13. Try searching with DuckDuckGo.

  13. branch_party_core

    Core library for branch-party CLI tool

    v0.1.1 #git-branch #git-merge #branch-merge #git #branch

  14. threeflow

    A git branching strategy which focuses on having 3 long-lived branches

    v0.3.1 #git-branch #strategy #long-lived #having #commit-message #git-merge #stack-overflow #en #blog