fac

Conflict resolver

A tool for resolving Git conflicts in the command line

Easy-to-use CUI for fixing git conflicts

2k stars

32 watching

51 forks

Language: Go

last commit: over 2 years ago

Linked from 3 awesome lists

command-lineconflict-resolutioncuigitgogolangutility

Backlinks from these awesome lists:

Related projects:

Repository	Description	Stars
grammatech/resolve	Tools to automate the process of comparing and resolving differences in software code	37
comwrap/msi-reservation	Resolves conflicts between ERP stock updates and Magento reservation logic	12
mbobakov/grpc-consul-resolver	Provides a plug-in compatible resolver to resolve gRPC service endpoints from Consul registrations.	323
lumapictures/usd-uri-resolver	A tool that resolves custom URIs for USD files using plug-in based resolvers.	49
fortio/cli	Reduces boilerplate code in Go main functions and command-line interfaces for tools and servers.	6
cosiner/argv	A library to parse and split command line strings into argument arrays	41
qookei/conflict	A C++17 command line argument parser library with basic options support	3
lrstanley/girc	A flexible IRC client library for Go, focusing on simplicity and event-based triggering.	139
golbin/git-commander	An interactive terminal-based git tool with a simple interface and customizable keybindings	1,111
akamensky/argparse	Provides a flexible and easy-to-use command line argument parsing solution for Go programs.	617
zentity-io/zentity	An Elasticsearch plugin for automatically resolving entities from disparate data sources.	158
manuranga/igni	A graphical client for Git that visualizes the commit history of a repository.	3
xxjwxc/public	A comprehensive utility package for Go programmers	175
fergstar/go-parse	A Go client library providing a set of pre-built services to interact with the Parse API.	1
gopinath-langote/1build	Automates project-specific command line aliases and tasks for improved productivity	227