git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
tig
Text-mode interface for git (by jonas)
git-conflict.nvim | tig | |
---|---|---|
10 | 60 | |
783 | 12,170 | |
- | - | |
7.4 | 7.3 | |
3 months ago | 5 days ago | |
Lua | C | |
- | GNU General Public License v3.0 only |
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
tig
Posts with mentions or reviews of tig.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2024-05-06.
-
Ask HN: Interesting TUIs (text user interfaces), maybe forgotten ones?
https://github.com/jonas/tig is one of the first things I install on a new dev machine. It's a really nice UI for staging files or hunks. Since it's just a companion to the git CLI, it feels much more focused than full-blown git GUIs, and doesn't do anything magical.
-
Every Git Command I Use (Cheatsheet)
Related but I use tig, a TUI, a lot to examine the state of my working tree and index and stage/unstage/reset changes piecemeal. It works great.
- Tig: Text-Mode Interface for Git
-
Magit
I'd like to plug [tig](https://github.com/jonas/tig) for those who don't use emacs. I see lazygit recommended here too, but I've been using tig for years now and love it's simplicity.
-
Is there any solution like Github Desktop and Gitkraken For terminal Users
Try tig
-
What is your preferred version control software and what additional features do you wish it had?
I'm normally a CLI git (and tig) user.
-
TexStudio - git integration for easy committing?
Sometimes when I work in command line I use tig (https://jonas.github.io/tig/). There is also similar tool lazygit (https://github.com/jesseduffield/lazygit)
-
gti, gtti, giit, gut, gti, got, hit, jit, git <enter> {f%ck} <up-arrow-key>
And you accidently open a git TUI
-
This is how I use vim and git, any other tips?
tig +My custom command to fix MR comments by quickly editing an old commit's changes at the time when that commit was created. (Like a more controlled git-absorb that explicitly selects a commit to fixup and therefor avoids rebase-conflicts when squashing)
-
tig to switch branches
today I looked at tig which is a nice text based GUI, and I think I will never use git log again :-)
What are some alternatives?
When comparing git-conflict.nvim and tig you can also consider the following projects:
vim-conflicted - Easy git merge conflict resolution in Vim
lazygit - simple terminal UI for git commands
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
conflict-marker.vim - Weapon to fight against conflicts in Vim.
lazygit.nvim - Plugin for calling lazygit from within neovim.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
vim-floaterm - :computer: Terminal manager for (neo)vim
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
gitsigns.nvim - Git integration for buffers
cz-cli - The commitizen command line utility. #BlackLivesMatter
git-conflict.nvim vs vim-conflicted
tig vs lazygit
git-conflict.nvim vs vim-mergetool
tig vs gitui
git-conflict.nvim vs conflict-marker.vim
tig vs lazygit.nvim
git-conflict.nvim vs neogit
tig vs vim-floaterm
git-conflict.nvim vs diffview.nvim
tig vs gitsigns.nvim
git-conflict.nvim vs lazygit.nvim
tig vs cz-cli