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
Easy-to-use online form builder for every business. Icon
Easy-to-use online form builder for every business.

Create online forms and publish them. Get an email for each response. Collect data.

Easy-to-use online form builder for every business. Create online forms and publish them. Get an email for each response. Collect data. Design professional looking forms with JotForm Online Form Builder. Customize with advanced styling options to match your branding. Speed up and simplify your daily work by automating complex tasks with JotForm’s industry leading features. Securely and easily sell products. Collect subscription fees and donations. Being away from your computer shouldn’t stop you from getting the information you need. No matter where you work, JotForm Mobile Forms lets you collect data offline with powerful forms you can manage from your phone or tablet. Get the full power of JotForm at your fingertips. JotForm PDF Editor automatically turns collected form responses into professional, secure PDF documents that you can share with colleagues and customers. Easily generate custom PDF files online!
Learn More
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