conflict-marker.vim
lazygit
| conflict-marker.vim | lazygit | |
|---|---|---|
| 6 | 145 | |
| 460 | 45,761 | |
| - | - | |
| 0.0 | 9.8 | |
| 6 months ago | 4 days ago | |
| Vim Script | 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.
conflict-marker.vim
- Rhysd/conflict-marker.vim: Weapon to fight against conflicts in Vim
-
what are the must have git plugs? in your opinion
For merge conflicts, https://github.com/rhysd/conflict-marker.vim is so much easier to use than any any other diff tool.
-
Can someone make a conflict marker plugin in lua please.
To all plugin devs, sometimes highlighting the conflict markers would be great. I would like a similar workflow like in vscode. The closest I found was the following, but unfortunately it's hard to get it to work with a modern color scheme. See the following issue.
- Is there a better way to see git diff in vim?
- I completely agree with him.
-
Is there any better merge conflict resolution available in VIM?
I use this plugin: https://github.com/rhysd/conflict-marker.vim
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?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
diffconflicts - A better Vimdiff Git mergetool
tig - Text-mode interface for git
auto-git-diff - A vim plugin which shows git diff for Git Rebase Interactive
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
magit - It's Magit! A Git Porcelain inside Emacs.
lazygit.nvim - Plugin for calling lazygit from within neovim.
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit