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
Categories
GitLicense
MIT LicenseFollow Fix All Conflicts
Other Useful Business Software
Our Free Plans just got better! | Auth0
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.
Rate This Project
Login To Rate This Project
User Reviews
Be the first to post a review of Fix All Conflicts!