{"id":13895818,"url":"https://github.com/tjdevries/diff-therapy.nvim","last_synced_at":"2025-03-16T21:30:26.371Z","repository":{"id":96938782,"uuid":"472761657","full_name":"tjdevries/diff-therapy.nvim","owner":"tjdevries","description":"resolve those conflicts and have a happy relationship with git","archived":false,"fork":false,"pushed_at":"2022-03-22T14:16:21.000Z","size":4,"stargazers_count":77,"open_issues_count":1,"forks_count":2,"subscribers_count":9,"default_branch":"master","last_synced_at":"2025-02-27T14:07:48.715Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"language":"Lua","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/tjdevries.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,"dei":null}},"created_at":"2022-03-22T12:39:46.000Z","updated_at":"2024-08-11T23:39:56.000Z","dependencies_parsed_at":"2023-03-13T16:21:53.761Z","dependency_job_id":null,"html_url":"https://github.com/tjdevries/diff-therapy.nvim","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/tjdevries%2Fdiff-therapy.nvim","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/tjdevries%2Fdiff-therapy.nvim/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/tjdevries%2Fdiff-therapy.nvim/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/tjdevries%2Fdiff-therapy.nvim/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/tjdevries","download_url":"https://codeload.github.com/tjdevries/diff-therapy.nvim/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":243830915,"owners_count":20354850,"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":[],"created_at":"2024-08-06T18:02:29.806Z","updated_at":"2025-03-16T21:30:26.092Z","avatar_url":"https://github.com/tjdevries.png","language":"Lua","funding_links":[],"categories":["Lua"],"sub_categories":[],"readme":"# diff-therapy.nvim\n\nresolve those conflicts and have a happy relationship with git\n\n## Goals\n\nRe-use as much as possible of `:help diff`, but also add new ways of looking\nat the conflicts and shortcuts for resolving them (that we can add locally\nto the buffer)\n\n- [ ] 3-way merge of branches (shows you context of base branch)\n  - [ ] Use virtual text and virtual lines to provide additional context to the user\n- [ ] Keyboard shortcut to choose left, choose right, choose base or modify\n- [ ] Folding for diff (probably using builtin `diff` stuff)\n- [ ] Move to next diff (but probably can just be ]c and [c ?)\n\n## Possible Extensions\n\n- Easy git log viewer / git tree visualization for a buffer, so you can figure out how this happened\n\n## Recommended settings\n\nSeems like default diff algo doesn't like this kind of merge, so maybe you need:\n\n```lua\nvim.opt.diffopt = { \"internal\", \"filler\", \"closeoff\", \"hiddenoff\", \"algorithm:minimal\" }\n```\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ftjdevries%2Fdiff-therapy.nvim","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Ftjdevries%2Fdiff-therapy.nvim","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ftjdevries%2Fdiff-therapy.nvim/lists"}