https://github.com/tjdevries/diff-therapy.nvim
resolve those conflicts and have a happy relationship with git
https://github.com/tjdevries/diff-therapy.nvim
Last synced: over 1 year ago
JSON representation
resolve those conflicts and have a happy relationship with git
- Host: GitHub
- URL: https://github.com/tjdevries/diff-therapy.nvim
- Owner: tjdevries
- License: mit
- Created: 2022-03-22T12:39:46.000Z (over 4 years ago)
- Default Branch: master
- Last Pushed: 2022-03-22T14:16:21.000Z (over 4 years ago)
- Last Synced: 2025-02-27T14:07:48.715Z (over 1 year ago)
- Language: Lua
- Size: 3.91 KB
- Stars: 77
- Watchers: 9
- Forks: 2
- Open Issues: 1
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# diff-therapy.nvim
resolve those conflicts and have a happy relationship with git
## Goals
Re-use as much as possible of `:help diff`, but also add new ways of looking
at the conflicts and shortcuts for resolving them (that we can add locally
to the buffer)
- [ ] 3-way merge of branches (shows you context of base branch)
- [ ] Use virtual text and virtual lines to provide additional context to the user
- [ ] Keyboard shortcut to choose left, choose right, choose base or modify
- [ ] Folding for diff (probably using builtin `diff` stuff)
- [ ] Move to next diff (but probably can just be ]c and [c ?)
## Possible Extensions
- Easy git log viewer / git tree visualization for a buffer, so you can figure out how this happened
## Recommended settings
Seems like default diff algo doesn't like this kind of merge, so maybe you need:
```lua
vim.opt.diffopt = { "internal", "filler", "closeoff", "hiddenoff", "algorithm:minimal" }
```