Easy-to-use CUI for fixing git conflicts
fe06d6f Remove brew dependency to git 1a8e180 Parse -version flag 3b133f5 Add versions flag d160b39 Update man page 2767e99 Add support for -h | --help 8e39330 Refactor enter detection 9eeca61 Update README with cont_eval f4a6481 Update tests for binding pkg 3f09e4c Improve warning/error message display mechanism e913d1d Update dummy fac yml 6f59a29 Implement continuous evaluation behavior 3fb2cca Change package 'key' to 'binding' 0a38b45 Arrow down to move to the end of prompt 335700b Add custom editor function for continuous eval 0de2cbe Add continuous evaluation to key binding table 54efd07 Add banner sketch file 5511c42 Appease go report card 16b474b Make coloring function public 729cceb Fix typos 6b6fb16 Add missing comments and refactor 02bd481 Fix nil binding map bug 96ca3ec Refactor globalQuit 4821de0 Add full test coverage to key package c335ee8 Add key-binding configuration README 48b1230 Update to use custom key bindings 7b53a69 Add key package to handle custom keys 02be1a6 Update dep for go-yml ae7f29c Add yellow color function for warnings 62373a1 Remove main package from testing list 9c16b8a Add support for editor env variable with flags d0fb86a Update README with new preview gif d93d37e Fix external editor crash bug f0822c9 Fix predicate for checking conflict existence 7d9024a Update editor reading/writing mechanism afe8327 Add manual code edit functionality 84fa845 Test: Add tests for color.go 01e6131 Use default gocui editor for user input 7d32441 Tests: Cover all cases for file.go ddf05f7 Test: add all tests for conflict pkg fb16830 Test: Add tests for command.go 46606a1 Add code coverage badge 😵 e04392c Integrate codecov with Travis CI b15c9ad Test: Add tests for summary.go 93ed8dd Test: Add tests for parse.go 7e45571 Test: Add tests for file.go a2da952 Test: Add tests for conflict.go 9dd4809 Refactor: Remove all global state via File structs c69a9bb Add global test cases ef7ef9a Add testdata directory for dummy test files 1a84012 Update gitignore de580dd Update Travis CI for code coverage 642a3ad Add link to gif demo 8bec3dc Add new fac banner e3cff7e Brew formula update for fac version v1.1.0
ce0a043 Update application screenshot 3d7e70d Add CI and Go report badges 51ef7cb Remove dummy git repo 42aacb4 Remove command tests d6bb1b5 Add Travis CI config file eb4a2ad Colorize diff3 separator marker 2230b51 Add tests for summary.go a04cfa0 Add support for diff3 conflict styling b0d661b Move and rename dummy git repo c1dd493 Refactor git conflict marker parsing methods 769ab01 Ignore existing conflict in test git submodule 7637551 Refactor git calling functions 05c8288 Add dummy git repo with conflict for testing 83ac734 Move documents to assets d8fe975 Update comments on functions ecba69c Use dep bf242e3 Remove vendor directory 2afd0bd Merge pull request #33 from shogo-ma/master 312f7c1 fix typo fb868ea Merge pull request #27 from olshevskiy87/t1 c4d1d39 Merge pull request #31 from jnv/patch-1 ba183d4 Goreleaser: Remove dep on go in Brew formula c86e474 Merge pull request #28 from antham/patch-1 9657490 Fix typo 8684e49 find and open conflict files from root git directory 8f11fd7 Merge pull request #24 from wezm/man 0a500c2 Add man page 4addf0d fac version v1.0.4
15e5119 Adjust scroll up behavior e493f71 Add warning message for unsupported diff3 conflict style 97b75b4 Change function name 0e9722c Update README about diff3 support 7d8c39e fac version v1.0.3
Automated with GoReleaser Built with go version go1.9.2 darwin/amd64
d6d7362 Update size of prompt panel to fit new prompt string 5841577 Update prompt string with a question mark 3114cf9 Add additional edge case for when there are no conflicts ec22b89 Merge pull request #20 from shogo-ma/iota 22848cc Merge pull request #19 from xyproto/emoji fd7acd8 use iota identifier 9f03977 Add missing emoji c51bfb5 Update LICENSE year :) 5ed0cdb Merge branch 'master' of https://github.com/mkchoi212/fac 3fcde53 fac version v1.0.2
Automated with GoReleaser Built with go version go1.9.2 darwin/amd64
b3b2638 Update goreleaser file 882e410 Remove unused diffpatch library from godep e03a608 Fix consecutive error handling logic 92c5515 Remove old diff toggle logic a6f86b9 Move indicator arrow to left 263c06e Merge branch 'master' of https://github.com/mkchoi212/fac 0b476dd Merge pull request #16 from eduardomoroni/patch-1 63516d9 missing brew install cb37a30 Print newline when printing error message on exit b236084 Merge pull request #11 from chrissrogers/patch-1 c6e6e37 Updates Homebrew formula SHA256 for v1.0.1 5a9aa17 Remove redundant homebrew script 53749d8 fac version v1.0.1 d2dd63a fac version v1.0.1
Automated with GoReleaser Built with go version go1.9.2 darwin/amd64
a5de217 fac version v1.0.1 e97c492 Move homebrew formula script to Formula dir 1148f98 Avoid formatting diff output f3b8a5c Update wording: Use 'local/remote version' instead of 'left/right screen' fa87656 Update README with brew tap formula 1aac2a9 Merge branch 'master' of https://github.com/mkchoi212/fac 86b9ee8 fac version v1.0.0
Automated with GoReleaser Built with go version go1.9.2 darwin/amd64
298d7e6 Add .goreleaser.yml cf0cb23 Add dist to gitignore de61c39 Add basic tests for conflict struct 46dd5b9 Rename variables bf900e3 Merge pull request #1 from md2perpe/patch-1 369f520 Use normal switch cases eccb198 Change check mark from emoji to simple txt 38f82ee Update README aa7da56 Create assets folder a7bcc41 Replace dummy paths with cwd 8f4df34 Add basic diff command file a17f24e Fix minor bugs 66122fe Change background color when conflict is resolved 6fd77f4 Remove diff option for now f94e86c Fix odd height and refactor title format 532d3c9 Change default view orientation and edit help fbe44e5 Add next/prev conflict keyboard shortcuts a3fceef Remove unncessary variable 41a8085 Major refactoring to go with seperated packages 47c5922 Create vendor directory with godep 97cd90d Add conlfict and color to imports b11a1b9 Seperate conflict as seperate package 2cbb1cd Seperate color as seperate package 6ffb5b1 Create Godeps folder 4b11691 Minor variable name changes 21634e1 Fix consecutive error help displaying code block 58cd719 Refactor Find function ac1123b Delete old git.go file 4ee25ec Add command file to handle os.Exec related functions 7456d0a Fix diff newline error 7068c59 Add seperate file for calling git 2e3a0b7 Handle no conflict error 4dd10fd Finish intial version of FinalizeChanges b7b7aa5 Retain all newlines and carriage returns when parsing files 131da5d Create first version of WriteChanges 28a354a Change bool Resolved conflict variable to Choice int variable 93fde8a Add z for toggling diff view f153931 Print help when user has no idea what he/she is doing d04835e Support multiple character inputs fb15258 Add j and k for scrolling up and down 1a90d93 Reorder functions in conflict b028aea Refactor color formatting code 873a977 Fix printing summary at the end 1e38e63 Add up and down scrolling to panel views e3e9f54 Add gray color 0a548c6 Change string literals to const vars 41b4847 Add q for quit cc25b6d Print summary after application exits f617cdb Define additional colors and styles 2cc0fd2 Print help with input character h e27a37f Create colorize function for colored outputs 43293a7 Update header image 3d14515 Quit application when all conflicts have been resolved e28b544 Parse invalid input command 33bd902 Rename conflict to parse b8b302f Update README.md with license information 2db2786 Create LICENSE 4b4547c Update README.md with header image d339a1b Move parse function 6ea3727 Start handling enter key from input prompt e4d7bc3 Use color function b023acc Add color code 6d16fc2 Fix enter input behavior b782e6c Seperate layout code 300358a Create layout for command prompt 2fc3f18 Create custom editor class for the prompt 4faa632 Add diffing library 84cfcee Add glide.yaml 7151bee Print highlighted versions of code 7810a0b Add file detection and colorized output 162b566 Enable swtiching between multiple conflicts da7adc8 Properly parse multiple conflicts from a single file 02788e7 Update gitignore with things from vscode 5c80934 Print basic conflict data to screen 3a2c7f4 Complete parsing and constructing array of conflicts b895d68 Add call to conflict.go 0f6039a Add call to git diff --check and basic output parsing function 4c83e3e Initial commit
Automated with GoReleaser Built with go version go1.9.2 darwin/amd64