# mkchoi212/fac

Easy-to-use CUI for fixing git conflicts

Repository: https://github.com/mkchoi212/fac
Canonical: https://ross.abutalabs.com/products/fac
Language: Go
License: MIT
License Family: permissive
Topics: go, golang, git, cui, conflict-resolution, utility, command-line
Last push: 2023-12-29T06:03:51+00:00

## Health v2 (maintenance only)
Score: 23/100 (v2, computed 2026-09-03T02:20:16.233290+00:00)
- activity 0, release rhythm 8, longevity 100
- inputs: {"age_days": 3169, "days_push": 978, "days_rel": null, "gap_med": null, "n_releases_24m": 0}
- flags: none
- formula: round(0.45*activity + 0.35*rhythm + 0.20*longevity); archived -> min(score, 10)

## Adoption (not part of the score)
Stars 1855, forks 51 (observed 2026-08-28T04:05:44.737145+00:00)

## What it is
fac is a terminal-based (CUI) interactive tool for resolving git merge conflicts, similar to git add -p but with a guided keybinding-driven interface. It is written in Go and lets users step through conflicts, choose local or incoming versions, or edit manually.

## Use cases
- resolve git merge conflicts in the terminal
- interactively pick local vs incoming conflict hunks
- replace clunky mergetools with a simpler workflow
- manually edit conflicted code during a merge
- navigate between multiple conflicts in a rebase

## When to choose
- you prefer keyboard-driven terminal workflows over GUI merge tools
- you want a lightweight git conflict resolver installable via go or homebrew
- you often resolve conflicts during rebases and want to jump between them

## When to avoid
- you need a visual three-pane diff GUI like kdiff3 or meld
- you need active development and frequent updates
- you don't use git from the command line

## Facets
- artifact type: cli-tool
- maturity: maintenance
- function: cli, developer-tools, version-control
- domain: developer-tools, version-control
- platform: cli, windows, cross-platform
- tags: git-conflicts, cui, terminal-ui, merge-tool, go, command-line, macos, linux

## Member repositories
- mkchoi212/fac (main) score 23

## Provenance
- Observed fields: from GitHub, fetched 2026-08-28T04:05:44.737145+00:00.
- Health v2: computed from the inputs above; adoption is never an input.
- Inferred fields (summary, facets, guidance): AI-extracted, prompt v1, taxonomy v1, on 2026-08-30T03:16:44.684156+00:00, confidence not recorded.
  - readme: https://github.com/mkchoi212/fac (fetched 2026-08-28T04:05:44.737145+00:00, sha b1e5cbfc86c9)
- Data as of 2026-08-30T08:39:29.467469+00:00.