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

Project Activity

See All Activity >

Categories

Git

License

MIT License

Follow Fix All Conflicts

Fix All Conflicts Web Site

Other Useful Business Software
Our Free Plans just got better! | Auth0 Icon
Our Free Plans just got better! | Auth0

With up to 25k MAUs and unlimited Okta connections, our Free Plan lets you focus on what you do best—building great apps.

You asked, we delivered! Auth0 is excited to expand our Free and Paid plans to include more options so you can focus on building, deploying, and scaling applications without having to worry about your security. Auth0 now, thank yourself later.
Try free now
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