I never really liked any of the mergetools out there so I made a program that is somewhat easier to use.fac operates much like git add -p . It has a prompt input at the bottom of the screen where the user inputs various commands. The above key-bindings and various behaviors can be altered by creating a .fac.yml file in your home directory. Please refer to the configuration README.md for more information.

Features

  • Customization
  • Easy-to-use CUI for fixing git conflicts
  • Execute using Homebrew
  • fac operates much like git add -p
  • It has a prompt input at the bottom of the screen where the user inputs various commands
  • The above key-bindings and various behaviors can be altered

Project Samples

Fix All Conflicts Screenshot 1

Project Activity

See All Activity >

Categories

Git

License

MIT License

Follow Fix All Conflicts

Fix All Conflicts Web Site

Other Useful Business Software
Forever Free Full-Stack Observability | Grafana Cloud Icon
Forever Free Full-Stack Observability | Grafana Cloud

Our generous forever free tier includes the full platform, including the AI Assistant, for 3 users with 10k metrics, 50GB logs, and 50GB traces.

Built on open standards like Prometheus and OpenTelemetry, Grafana Cloud includes Kubernetes Monitoring, Application Observability, Incident Response, plus the AI-powered Grafana Assistant. Get started with our generous free tier today.
Create free account
Rate This Project
Login To Rate This Project

User Reviews

Be the first to post a review of Fix All Conflicts!

Additional Project Details

Operating Systems

Linux, Mac, Windows

Programming Language

Go

Related Categories

Go Git Software

Registered

2022-12-22
Report inappropriate content