git-conflict.nvim
neovim
Our great sponsors
git-conflict.nvim | neovim | |
---|---|---|
10 | 1382 | |
743 | 75,505 | |
- | 2.9% | |
7.4 | 10.0 | |
2 months ago | 1 day ago | |
Lua | Vim Script | |
- | GNU General Public License v3.0 or later |
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
- 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
-
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
-
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.
-
Neovide – a simple, no-nonsense, cross-platform GUI for Neovim
Neovide requires nvim version 0.9.2 or higher. Download the latest version here https://github.com/neovim/neovim/wiki/Installing-Neovim (error 404)
Yes:
https://github.com/equalsraf/neovim-qt
There are quite a few GUI front-ends options available:
- Neovim v0.9.5 Released
-
Clipboards, Terminals, and Linux
I've recently switched to Neovim, and with it begun using the terminal mouse support. But, this has the side-effect that I can't just click-and-drag to select text in the terminal anymore -- Neovim controls that as well.
- Tell HN: My Favorite Tools
What are some alternatives?
vim9 - An experimental fork of Vim, exploring ways to make Vim script faster and better.
helix - A post-modern modal text editor.
neovide - No Nonsense Neovim Client in Rust
doom-emacs - An Emacs framework for the stubborn martian hacker [Moved to: https://github.com/doomemacs/doomemacs]
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]
LunarVim - 🌙 LunarVim is an IDE layer for Neovim. Completely free and community driven.
vim-polyglot - A solid language pack for Vim.
pylance-release - Documentation and issues for Pylance
neovim-qt - Neovim client library and GUI, in Qt5.
vim-visual-multi - Multiple cursors plugin for vim/neovim
FiraCode - Free monospaced font with programming ligatures
intellij-lsp-server - Exposes IntelliJ IDEA features through the Language Server Protocol.