Issues

• Signifcant performance overhead on watching .git folder

  akinsho/git-conflict.nvim#129 · Filter by author dmtrKovalenko opened on Jun 30, 2026
  1

• Add license to plugin

  akinsho/git-conflict.nvim#128 · Filter by author johnDeSilencio opened on May 5, 2026

• nvim deprecation warning "WARNING vim.highlight is deprecated. Feature will be removed in Nvim 2.0.0"

  akinsho/git-conflict.nvim#127 · Filter by author rajcspsg opened on Apr 25, 2026
  1

• GitConflictDetected not triggered by git alias

  akinsho/git-conflict.nvim#123 · Filter by author SinixND opened on Dec 13, 2025

• feature: support jujutsu conflicts

  akinsho/git-conflict.nvim#121 · Filter by author Spiegie opened on Nov 17, 2025
  4

• Crashed on :cdo s/foo/bar

  akinsho/git-conflict.nvim#120 · Filter by author timsofteng opened on Oct 22, 2025

• GitConflictDetected error when disabling diagnostics on Neovim nightly

  akinsho/git-conflict.nvim#119 · Filter by author wassimk opened on Sep 21, 2025
  1

• WARNING vim.highlight is deprecated

  akinsho/git-conflict.nvim#117 · Filter by author piersolenski opened on Aug 25, 2025

• Is this plugin being maintained?

  akinsho/git-conflict.nvim#115 · Filter by author alioshr opened on Aug 6, 2025
  3

• Show the shortcuts to merge each block in the header of the chunk

  akinsho/git-conflict.nvim#114 · Filter by author leiserfg opened on Jul 27, 2025

• Is there a way to hide ancestor/base block?

  akinsho/git-conflict.nvim#113 · Filter by author edte opened on Jul 22, 2025

• plugin only works on the first file opened

  akinsho/git-conflict.nvim#111 · Filter by author YouSame2 opened on May 17, 2025
  1

• Add check health

  akinsho/git-conflict.nvim#104 · Filter by author adilJamshad opened on Jan 25, 2025

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

  akinsho/git-conflict.nvim#103 · Filter by author uloco opened on Jan 3, 2025
  3

• GitConflictDetected and GitConflictResolved event triggered more than once

  akinsho/git-conflict.nvim#101 · Filter by author Kaiser-Yang opened on Dec 25, 2024

• How do I change highlight colors?

  akinsho/git-conflict.nvim#99 · Filter by author Hugo-Persson opened on Dec 11, 2024
  2

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

  akinsho/git-conflict.nvim#91 · Filter by author FredrikMorstad opened on Jul 9, 2024
  1

• Plugin doesnt work in specific file types

  akinsho/git-conflict.nvim#80 · Filter by author ep4sh opened on Apr 4, 2024
  1

• crash if use 4 version of file

  akinsho/git-conflict.nvim#79 · Filter by author palandovalex opened on Mar 8, 2024
  1

• Highlighting does not work if markers are not visible

  akinsho/git-conflict.nvim#57 · Filter by author uloco opened on Jun 14, 2023
  2

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

  akinsho/git-conflict.nvim#55 · Filter by author nsoufian opened on May 16, 2023
  3

• Feature request: choose under cursor

  akinsho/git-conflict.nvim#48 · Filter by author pesader opened on Mar 24, 2023
  4

• Conflict markers not shown until I restart vim

  akinsho/git-conflict.nvim#36 · Filter by author uloco opened on Nov 25, 2022
  1

• Feature: Choose Ours/Theirs/Both for entire File

  akinsho/git-conflict.nvim#34 · Filter by author ariel-frischer opened on Oct 31, 2022
  10