Search results

Add check health

Status: Open.

#104 In akinsho/git-conflict.nvim;

· adilJamshad opened on Jan 25, 2025

None of the editor commands work (e.g. :GitConflictChooseOurs)

Status: Open.

#103 In akinsho/git-conflict.nvim;

· uloco opened on Jan 3, 2025

GitConflictDetected and GitConflictResolved event triggered more than once

Status: Open.

#101 In akinsho/git-conflict.nvim;

· Kaiser-Yang opened on Dec 25, 2024

How do I change highlight colors?

Status: Open.

#99 In akinsho/git-conflict.nvim;

· Hugo-Persson opened on Dec 11, 2024

Bug: nil error on moving to next conflict when first opening the conflict file

Status: Open.

#91 In akinsho/git-conflict.nvim;

· FredrikMorstad opened on Jul 9, 2024

Plugin doesnt work in specific file types

Status: Open.

#80 In akinsho/git-conflict.nvim;

· ep4sh opened on Apr 4, 2024

crash if use 4 version of file

Status: Open.

#79 In akinsho/git-conflict.nvim;

· palandovalex opened on Mar 8, 2024

Highlighting does not work if markers are not visible

Status: Open.

#57 In akinsho/git-conflict.nvim;

· uloco opened on Jun 14, 2023

Introduce a new event GitConflictAborted or fire GitConflictResolved when git merge conflict is aborted

Status: Open.

#55 In akinsho/git-conflict.nvim;

· nsoufian opened on May 16, 2023

Feature request: choose under cursor

Status: Open.

#48 In akinsho/git-conflict.nvim;

· pesader opened on Mar 24, 2023

Conflict markers not shown until I restart vim

Status: Open.

#36 In akinsho/git-conflict.nvim;

· uloco opened on Nov 25, 2022

Feature: Choose Ours/Theirs/Both for entire File

Status: Open.

#34 In akinsho/git-conflict.nvim;

· ariel-frischer opened on Oct 31, 2022