Merge Conflicts
3 projects
Showing 3 of 3 projects
facGo
A command-line interface tool for resolving git merge conflicts with intuitive keyboard shortcuts.
#version-control#developer-tools#productivity
Stars1.9k
Forks51
Last commit2 years ago
diffs.nvimLua
Treesitter-powered diff syntax highlighting for Neovim, enhancing built-in diff mode with language-aware highlighting.
#treesitter#merge-conflicts#vim
Stars145
Forks3
Last commit20 hours ago
headhunter.nvimLua
A Neovim plugin for fast navigation and resolution of merge conflicts with customizable keybindings.
#version-control#developer-tools#productivity
Stars57
Forks3
Last commit7 months ago
Community-curated · Updated weekly · 100% open source
Found a gem we're missing?
Open-Awesome is built by the community, for the community. Submit a project, suggest an awesome list, or help improve the catalog on GitHub.