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

You Might Also Like
Employee monitoring software with screenshots Icon
Employee monitoring software with screenshots

Clear visibility and insights into how employees work. Even remotely

Our computer monitoring software allows employees, field contractors, and freelancers to manually clock in when they begin working on an assignment. The application will take screenshots randomly or at set intervals, which allows employers to observe the work process. The application only tracks activity when the employee is clocked in. No spying, only transparency.
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