fac
fac copied to clipboard
mkchoi212
Easy-to-use CUI for fixing git conflicts
hello, @mkchoi212 ## read me section - Deprecation of 'go get' for installing executables https://go.dev/doc/go-get-install-deprecation change bash script
I moved to a new computer, and fetched an updated version of Fac (great piece of software, thank you) -- and notice that the links in the terminal diffs are...
When a conflict is accidentally resolved (such a pressing `a` twice), there is no way to get back to it with `p` and reedit.
I tried to rebase https://github.com/terraform-providers/terraform-provider-github/pull/96 on top of https://github.com/terraform-providers/terraform-provider-github/pull/108/files and got this. First I tried to see the result of previous conflict resolution using `[p]`, but it looked like result...
Pressing `?` does nothing with latest `go get` version. 
The `|||||` marker isn't removed when the conflict is resolved and ends up in the codebase.
I use [yadm] to manage my dotfiles, and occasionally get merge conflicts, which are moderately annoying to clean up. Is there any chance that fac could be made to support...
What about `e` to edit or `o` to open . In case I manually want to merge the conflict
Hi! Thanks for this great tool! I've tried to configure it as a Git mergetool: ``` git config --global merge.tool fac ``` However, Git ignores it and it runs `vimdiff`...
