oxocarbon-lua.nvim
A lua rewrite of the original oxocarbon theme. (by B4mbus)
git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
| oxocarbon-lua.nvim | git-conflict.nvim | |
|---|---|---|
| 4 | 10 | |
| 84 | 783 | |
| - | - | |
| 7.5 | 7.4 | |
| over 1 year ago | 3 months ago | |
| Lua | Lua | |
| MIT License | - |
The number of mentions indicates the total number of mentions that we've tracked plus the number of user suggested alternatives.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
oxocarbon-lua.nvim
Posts with mentions or reviews of oxocarbon-lua.nvim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-11-17.
- Does anyone know which theme is this?
-
Update: Diffview.nvim now has a merge tool!
I think he is using oxocarbon. There are two different versions of the theme: One written in rust and one written in lua.
-
Any suggestions for retro colorschemes?
If you're going for the classic vaporwave aesthetic that encompasses a saturated palette leaning on purple/rose, I think you could do worse than start from oxocarbon, at least that's the kinda vibe i get looking at it ( link to lua version, includes a link to original implementation in rust and its screenshots ).
-
oxocarbon.nvim lua rewrite
I really liked the original oxocarbon.nvim plugin, but I didn't like the fact that I'd have to install Rust as a dependency to use it, so I made a quick rewrite to lua - oxocarbon-lua.nvim.
git-conflict.nvim
Posts with mentions or reviews of git-conflict.nvim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-01-01.
- Ask HN: What is your favorite tool to resolve Git merge conflicts?
-
How do I make treesitter highlight conflict markers properly?
git-conflicts.nvim plugin provides highlighting for conflict markers.
- Neovim - Workflow para Java, C# e JS/TypeScript (Atualização com Neovim 0.8 e LSP)
-
Poll: how do you jump to Git conflict markers?
I use akinsho/git-conflict and it does its job: minimal and efficient.
- Let the IDE wars, uh, continue!
-
Git workflow
git-conflict that puts at your disposal straightforward interfaces to solve merge conflicts
-
Update: Diffview.nvim now has a merge tool!
It offers a number of preset layouts, including three variations on a 3-way diff layout, one 4-way diff layout as well as a one plain single window layout (for when you prefer editing the conflict markers manually without the visual noise from diffs, or you're using something like git-conflict.nvim).
- What git plugin is being used?
-
Which tools do you use for Git Conflicts?
Maybe give https://github.com/akinsho/git-conflict.nvim a try, another alternative could be fugitive by tpope iirc.
- what are the must have git plugs? in your opinion
What are some alternatives?
When comparing oxocarbon-lua.nvim and git-conflict.nvim you can also consider the following projects:
neovim - Soho vibes for Neovim
vim-conflicted - Easy git merge conflict resolution in Vim
oxocarbon.nvim - A dark and light Neovim theme written in fennel, inspired by IBM Carbon. [Moved to: https://github.com/nyoom-engineering/oxocarbon.nvim]
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
dotfiles
conflict-marker.vim - Weapon to fight against conflicts in Vim.
nvim - 🍨 Soothing pastel theme for (Neo)vim
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
lazygit.nvim - Plugin for calling lazygit from within neovim.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
oxocarbon-lua.nvim vs neovim
git-conflict.nvim vs vim-conflicted
oxocarbon-lua.nvim vs oxocarbon.nvim
git-conflict.nvim vs vim-mergetool
oxocarbon-lua.nvim vs dotfiles
git-conflict.nvim vs conflict-marker.vim
oxocarbon-lua.nvim vs nvim
git-conflict.nvim vs neogit
git-conflict.nvim vs diffview.nvim
git-conflict.nvim vs lazygit.nvim
git-conflict.nvim vs vim-fugitive
git-conflict.nvim vs diff-therapy.nvim