git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
neovim
Vim-fork focused on extensibility and usability (by neovim)
Our great sponsors
| git-conflict.nvim | neovim | |
|---|---|---|
| 10 | 1,384 | |
| 777 | 76,465 | |
| - | 2.7% | |
| 7.4 | 10.0 | |
| 3 months ago | 4 days ago | |
| Lua | Vim Script | |
| - | GNU General Public License v3.0 or later |
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.
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
neovim
Posts with mentions or reviews of neovim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2024-04-23.
-
Why Neovim is My Text Editor of Choice
As a software engineer, choosing and understanding your text editor is important part of your work, as it impacts your productivity and workflow efficiency. It's like choosing the perfect tool for any trade - you need to know what tool to use and how to use it effectively if you want to excel. For me, I use Neovim as my editor and I have been using it for a little over a year now.
-
Let's See Your Terminal
This got me thinking about my recent pivot, my switch to Neovim by way of LazyVim to write most of my code, and using tmux to keep terminal states alive after closing a session.
-
Level Up Your Dev Workflow: Conquer Web Development with a Blazing Fast Neovim Setup (Part 1)
Neovim: Make sure you have Neovim installed on your system. You can check the official website for installation instructions: https://neovim.io/ Git: We'll be using Git to clone the LazyVim starter pack. If you don't have Git, you can download it from https://git-scm.com/downloads
- Helix - Front-End Power
- Neovim
-
Effective Neovim Setup. A Beginner’s Guide
There are several ways to install Neovim. This wiki provides several guidelines on how to install Neovim.
-
Aftermath of switching from VSCode to Neovim
All these thoughts I've shared, I would have them on occasion - but ever since I switched to Linux and Neovim, my curiosity has been through the roof. Switching over to Neovim and Linux was a not so fun weekend of configuration and spending half a day getting my work's local dev environment running on my new OS (which no one has tested development on). But I now have a deeper understanding of the tools I use, and have a text editor configured to be the most optimal for the way I want to use it.
- Neovim is 10 years old today
- Neovide – a simple, no-nonsense, cross-platform GUI for Neovim
- Neovim v0.9.5 Released
What are some alternatives?
When comparing git-conflict.nvim and neovim you can also consider the following projects:
vim-conflicted - Easy git merge conflict resolution in Vim
vim9 - An experimental fork of Vim, exploring ways to make Vim script faster and better.
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
helix - A post-modern modal text editor.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
neovide - No Nonsense Neovim Client in Rust
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
doom-emacs - An Emacs framework for the stubborn martian hacker [Moved to: https://github.com/doomemacs/doomemacs]
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
AstroVim - AstroNvim is an aesthetic and feature-rich neovim config that is extensible and easy to use with a great set of plugins [Moved to: https://github.com/AstroNvim/AstroNvim]
lazygit.nvim - Plugin for calling lazygit from within neovim.
LunarVim - 🌙 LunarVim is an IDE layer for Neovim. Completely free and community driven.
git-conflict.nvim vs vim-conflicted
neovim vs vim9
git-conflict.nvim vs vim-mergetool
neovim vs helix
git-conflict.nvim vs conflict-marker.vim
neovim vs neovide
git-conflict.nvim vs neogit
neovim vs doom-emacs
git-conflict.nvim vs diffview.nvim
neovim vs AstroVim
git-conflict.nvim vs lazygit.nvim
neovim vs LunarVim