git-conflict.nvim
lazygit
| git-conflict.nvim | lazygit | |
|---|---|---|
| 10 | 145 | |
| 783 | 45,761 | |
| - | - | |
| 7.4 | 9.8 | |
| 3 months ago | 3 days ago | |
| Lua | Go | |
| - | 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.
git-conflict.nvim
- 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
lazygit
-
Why Don't I Like Git More?
I've started to en ntegrate lazygit into my workflow.
It's quite easy to work with and I use git in a more powerfull way. My main problem is finding the way in all hotkeys.
https://github.com/jesseduffield/lazygit?tab=readme-ov-file#...
- Lazygit Release v0.41.0
-
How to be good at Open Source 🧑💻🌏
I recently did this with lazygit, a terminal-based git client I use every day. I wanted to add co-authors to commits, which is handy for pair programming at Incubyte
- Lazygit v0.41
-
Easy Access to Terminal Commands in Neovim using FTerm
The last thing you really need is a common set of tools that you want fingertip access to. I really commonly use LazyGit and K9s in my day job so those are the tools I will show off in this article.
-
Level Up Your Dev Workflow: Conquer Web Development with a Blazing Fast Neovim Setup (Part 1)
lazygit (optional)
-
Yozora: Linux Configurator
gl is a lazygit extended command, fist refreshes the deleted remote branches and then opens lazygit.
-
5 Developer CLI Essentials
3. lazygit
-
Ask HN: Can we do better than Git for version control?
Yes, but due to its simplicity + extensibility + widespread adoption, I wouldn’t be surprised if we’re still using Git 100+ years from now.
The current trend (most popular and IMO likely to succeed) is to make tools (“layers”) which work on top of Git, like more intuitive UI/patterns (https://github.com/jesseduffield/lazygit, https://github.com/arxanas/git-branchless) and smart merge resolvers (https://github.com/Symbolk/IntelliMerge, https://docs.plasticscm.com/semanticmerge/how-to-configure/s...). Git it so flexible, even things that it handles terribly by default, it handles
-
Slow magit and async input
I have the same issue with big repos, but in my case it hangs for minutes. In those instances I use lazygit
What are some alternatives?
vim-conflicted - Easy git merge conflict resolution in Vim
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
tig - Text-mode interface for git
conflict-marker.vim - Weapon to fight against conflicts in Vim.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
magit - It's Magit! A Git Porcelain inside Emacs.
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.