Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/mkchoi212/fac
Easy-to-use CUI for fixing git conflicts
https://github.com/mkchoi212/fac
command-line conflict-resolution cui git go golang utility
Last synced: 25 days ago
JSON representation
Easy-to-use CUI for fixing git conflicts
- Host: GitHub
- URL: https://github.com/mkchoi212/fac
- Owner: mkchoi212
- License: mit
- Created: 2017-12-29T19:11:45.000Z (almost 7 years ago)
- Default Branch: master
- Last Pushed: 2023-12-29T06:03:51.000Z (10 months ago)
- Last Synced: 2024-09-27T04:04:53.503Z (about 1 month ago)
- Topics: command-line, conflict-resolution, cui, git, go, golang, utility
- Language: Go
- Homepage:
- Size: 1.42 MB
- Stars: 1,839
- Watchers: 32
- Forks: 51
- Open Issues: 9
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
- awesome-list - fac - to-use CUI for fixing git conflicts | mkchoi212 | 1722 | (Go)
- awesome-go - fac - Command-line user interface to fix git merge conflicts. Stars:`1.8K`. (Software Packages / DevOps Tools)
- command-line-tools - fac - Easy-to-use CUI for fixing git conflicts. (Git)
- awesome-go - fac - Easy-to-use CUI for fixing git conflicts - ★ 1508 (Software Packages)
- awesome-go-extra - fac - to-use CUI for fixing git conflicts|1766|51|10|2017-12-29T19:11:45Z|2022-08-07T17:29:53Z| (Go Tools / DevOps Tools)
- awesome-hacking-lists - mkchoi212/fac - Easy-to-use CUI for fixing git conflicts (Go)
- starred-awesome - fac - Easy-to-use CUI for fixing git conflicts (Go)
README
Easy-to-use CUI for fixing git conflicts
I never really liked any of the `mergetools` out there so I made a program that is somewhat easier to use.
## 👷 Installation
Execute:
```bash
$ go install github.com/mkchoi212/fac@latest
```
Or using [Homebrew 🍺](https://brew.sh)
```bash
brew tap mkchoi212/fac https://github.com/mkchoi212/fac.git
brew install fac
```
## 🔧 Using
`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 commands have been preset to the following specifications
| Keybinding | Description |
| ------------------------------- | -------------------- |
| w | show more lines up |
| s | show more lines down |
| a | use local version |
| d | use incoming version |
| e | manually edit code |
| j | scroll down |
| k | scroll up |
| v | [v]iew orientation |
| n | [n]ext conflict |
| p | [p]revious conflict |
| h, ? | [h]elp |
| q, Ctrl+c | [q]uit |
```
[w,a,s,d,?] >> [INPUT HERE]
```
### ⚙️ Customization
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](./binding/README.md) for more information.
## ✋ Contributing
This is an open source project so feel free to contribute by
- Opening an [issue](https://github.com/mkchoi212/fac/issues/new)
- Sending me feedback via [email](mailto://[email protected])
- Or [tweet](https://twitter.com/Bananamlkshake2) at me!
## 👮 License
See [License](./LICENSE)