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
$300 Free Credits for Your Google Cloud Projects Icon
$300 Free Credits for Your Google Cloud Projects

Start building on Google Cloud with $300 in free credits. No commitment, no credit card required until you're ready to scale.

Launch your next project with $300 in free Google Cloud credits—no strings attached. Test, build, and deploy without risk. Use your credits across the entire Google Cloud platform to find what works best for your needs. After your credits are used, continue with always-free tier services. Only pay when you're ready to scale. Sign up in minutes and start exploring.
Start Free Trial
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