Skills
.Work. You
Rest

git-conflict.nvim

Community

Resolve Git conflicts efficiently

Software Engineering#git#developer tools#merge#neovim#conflict resolution#vcs
AuthorNeKon69
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps developers manage and resolve merge conflicts within their Git repositories more effectively, reducing the time and frustration associated with code integration.

Core Features & Use Cases

  • Conflict Navigation: Quickly jump between conflict markers in a file.
  • Conflict Resolution: Provides tools to choose between conflicting versions of code.
  • Use Case: When merging branches, you encounter multiple conflicts. Use this Skill to systematically review each conflict, decide which changes to keep, and resolve them without manual searching.

Quick Start

Use the git-conflict.nvim skill to find the next conflict marker in the current buffer.

Dependency Matrix

Required Modules

None required

Components

references

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: git-conflict.nvim
Download link: https://github.com/NeKon69/nvim-dot/archive/main.zip#git-conflict-nvim

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.