vim-mergetool
vim-floaterm
vim-mergetool | vim-floaterm | |
---|---|---|
6 | 59 | |
281 | 2,388 | |
- | - | |
0.0 | 5.9 | |
over 3 years ago | 29 days ago | |
Vim Script | Vim Script | |
MIT License | MIT License |
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.
vim-mergetool
-
Any plugin to achieve this dual buffer view for diffs?
I'm using diffview.nvim and https://github.com/samoshkin/vim-mergetool for merge conflicts resolving.
-
What git plugin is being used?
For resolving merge conflicts: samoshkin/vim-mergetool
-
what are the must have git plugs? in your opinion
I haven't seen https://github.com/samoshkin/vim-mergetool mentioned. I'm more and more gravitating towards 2-way diff viewing, also using diffview.nvim. also wrote https://github.com/emmanueltouzery/agitator.nvim with a few helpful functions for my use. And then others that have been mentioned, neogit, gitsigns.
-
Is there a better way to see git diff in vim?
You should also try vim-mergetool .
- Please finally tell me how do you resolve conflicts in (neo)vim?
- Using neovim as a git diff tool
vim-floaterm
-
Terminal workflow with GUI Neovim
Using https://github.com/voldikss/vim-floaterm and remap the same shortcuts to (un)toggle the terminal would be interesting for you, also about compatibility, because if tomorrow you use nvim in the terminal you have the same key maps.
-
Terminal filemanager that works good with neovim
vim-floaterm has wrappers around some terminal filemanagers.
-
Tools for productivity
If you don't like distro's and want to use something of your own, make sure that you have a few plugins like telescope.nvim, lazy.nvim, toggleterm.nvim Or vim-floaterm, gitsigns.nvim, which-key.nvim, which will make your neovim journey smooth. Again these are just few, but I highly recommend it.
-
Managing your files. How do you do it?
My personal favorite is ranger, a multi-panel console file manager that works nicely in a Neovim terminal. I also use floaterm to get floating terminal windows for ranger and lazygit, but that's optional. A Neovim tab with a terminal would work equally well.
-
Git CLI tools and vim
For simple tasks like opening a dirty file in nvim I prefer vim-floaterm. It has a really nice integration with a bunch of TUI tools.
- Neovim - Workflow para Java, C# e JS/TypeScript (Atualização com Neovim 0.8 e LSP)
- Plugin suggestion
-
I appreciate the excellent FTerm.nvim plugin
The two obvious candidates are vim-floaterm and toggleterm.nvim.
-
vim as a python IDE?
I’d suggest taking a look at vim-floaterm. While I don’t use this feature, it should have the ability to do what you’ve described
-
What is your approach to quick note taking during development?
vimwiki + floatterm + vimwiki-sync
What are some alternatives?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
toggleterm.nvim - A neovim lua plugin to help easily manage multiple terminal windows
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.
lazygit - simple terminal UI for git commands
nvim-bqf - Better quickfix window in Neovim, polish old quickfix window.
diffconflicts - A better Vimdiff Git mergetool
lspsaga.nvim - improve neovim lsp experience [Moved to: https://github.com/nvimdev/lspsaga.nvim]
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
tig - Text-mode interface for git
linediff.vim - A vim plugin to perform diffs on blocks of code
vim-slime - A vim plugin to give you some slime. (Emacs)