{"id":13393151,"url":"https://github.com/mkchoi212/fac","last_synced_at":"2025-05-15T15:04:16.713Z","repository":{"id":47726268,"uuid":"115747740","full_name":"mkchoi212/fac","owner":"mkchoi212","description":"Easy-to-use CUI for fixing git conflicts","archived":false,"fork":false,"pushed_at":"2023-12-29T06:03:51.000Z","size":1493,"stargazers_count":1848,"open_issues_count":9,"forks_count":50,"subscribers_count":31,"default_branch":"master","last_synced_at":"2025-03-31T16:13:18.391Z","etag":null,"topics":["command-line","conflict-resolution","cui","git","go","golang","utility"],"latest_commit_sha":null,"homepage":"","language":"Go","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/mkchoi212.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null}},"created_at":"2017-12-29T19:11:45.000Z","updated_at":"2025-03-24T23:51:17.000Z","dependencies_parsed_at":"2023-12-29T07:23:24.312Z","dependency_job_id":"79b2d06a-1e2d-46c1-94ce-aa7113f9adbd","html_url":"https://github.com/mkchoi212/fac","commit_stats":{"total_commits":187,"total_committers":14,"mean_commits":"13.357142857142858","dds":0.09090909090909094,"last_synced_commit":"b1d27a166d0f5abea837d68025eda9419ae962d8"},"previous_names":[],"tags_count":7,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mkchoi212%2Ffac","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mkchoi212%2Ffac/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mkchoi212%2Ffac/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mkchoi212%2Ffac/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/mkchoi212","download_url":"https://codeload.github.com/mkchoi212/fac/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":247694875,"owners_count":20980733,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["command-line","conflict-resolution","cui","git","go","golang","utility"],"created_at":"2024-07-30T17:00:44.166Z","updated_at":"2025-04-07T17:06:48.240Z","avatar_url":"https://github.com/mkchoi212.png","language":"Go","readme":"\u003cp align=\"center\"\u003e\r\n  \u003cimg src=\"./assets/banner.png\"\u003e\r\n  \u003cbr\u003e\r\n  Easy-to-use CUI for fixing git conflicts\r\n  \u003cbr\u003e\r\n  \u003cbr\u003e\r\n  \u003cp align=\"center\"\u003e\r\n    \u003ca href=\"https://travis-ci.org/mkchoi212/fac\"\u003e\r\n      \u003cimg src=\"https://travis-ci.org/mkchoi212/fac.svg?branch=master\"\u003e\r\n    \u003c/a\u003e\r\n    \u003ca href=\"https://goreportcard.com/report/github.com/mkchoi212/fac\"\u003e\r\n      \u003cimg src=\"https://goreportcard.com/badge/github.com/mkchoi212/fac\"\u003e\r\n    \u003c/a\u003e\r\n    \u003ca href=\"https://codecov.io/gh/mkchoi212/fac\"\u003e\r\n      \u003cimg src=\"https://codecov.io/gh/mkchoi212/fac/branch/master/graph/badge.svg\"\u003e\r\n    \u003c/a\u003e\r\n  \u003c/p\u003e\r\n\u003c/p\u003e\r\n\u003cbr\u003e\r\n\r\nI never really liked any of the `mergetools` out there so I made a program that is somewhat easier to use.\r\n\r\n![Preview](https://i.imgur.com/GsJMRIp.gif)\r\n\r\n## 👷 Installation\r\n\r\nExecute:\r\n\r\n```bash\r\n$ go install github.com/mkchoi212/fac@latest\r\n```\r\n\r\nOr using [Homebrew 🍺](https://brew.sh)\r\n\r\n```bash\r\nbrew tap mkchoi212/fac https://github.com/mkchoi212/fac.git\r\nbrew install fac\r\n```\r\n\r\n## 🔧 Using\r\n\r\n`fac` operates much like `git add -p` . It has a prompt input at the bottom of the screen where the user inputs various commands.\r\n\r\nThe commands have been preset to the following specifications\r\n\r\n| Keybinding                      | Description          |\r\n| ------------------------------- | -------------------- |\r\n| \u003ckbd\u003ew\u003c/kbd\u003e                    | show more lines up   |\r\n| \u003ckbd\u003es\u003c/kbd\u003e                    | show more lines down |\r\n| \u003ckbd\u003ea\u003c/kbd\u003e                    | use local version    |\r\n| \u003ckbd\u003ed\u003c/kbd\u003e                    | use incoming version |\r\n| \u003ckbd\u003ee\u003c/kbd\u003e                    | manually edit code   |\r\n| \u003ckbd\u003ej\u003c/kbd\u003e                    | scroll down          |\r\n| \u003ckbd\u003ek\u003c/kbd\u003e                    | scroll up            |\r\n| \u003ckbd\u003ev\u003c/kbd\u003e                    | [v]iew orientation   |\r\n| \u003ckbd\u003en\u003c/kbd\u003e                    | [n]ext conflict      |\r\n| \u003ckbd\u003ep\u003c/kbd\u003e                    | [p]revious conflict  |\r\n| \u003ckbd\u003eh\u003c/kbd\u003e, \u003ckbd\u003e?\u003c/kbd\u003e      | [h]elp               |\r\n| \u003ckbd\u003eq\u003c/kbd\u003e, \u003ckbd\u003eCtrl+c\u003c/kbd\u003e | [q]uit               |\r\n\r\n```\r\n[w,a,s,d,?] \u003e\u003e [INPUT HERE]\r\n```\r\n\r\n### ⚙️ Customization\r\n\r\nThe above key-bindings and various behaviors can be altered by creating a `.fac.yml` file in your home directory.\r\nPlease refer to the [configuration README.md](./binding/README.md) for more information.\r\n\r\n## ✋ Contributing\r\n\r\nThis is an open source project so feel free to contribute by\r\n\r\n- Opening an [issue](https://github.com/mkchoi212/fac/issues/new)\r\n- Sending me feedback via [email](mailto://mkchoi212@icloud.com)\r\n- Or [tweet](https://twitter.com/Bananamlkshake2) at me!\r\n\r\n## 👮 License\r\n\r\nSee [License](./LICENSE)\r\n","funding_links":[],"categories":["Go","Software Packages","Go (531)","DevOps Tools","软件包","Go Tools","Go 工具","Git"],"sub_categories":["DevOps Tools","DevOps 工具","devops 工具","代码分析","DevOps工具"],"project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmkchoi212%2Ffac","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fmkchoi212%2Ffac","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmkchoi212%2Ffac/lists"}