Skip to content

Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker

License

Notifications You must be signed in to change notification settings

OJFord/vim-quickfix-conflicts

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

4 Commits
 
 
 
 
 
 
 
 

Repository files navigation

Quickfix Conflicts

vim-quickfix-conflicts is a vim plugin that allows you to find and hop between git conflict markers using vim's built-in quickfix list. (:h quickfix)

Installation

Follow your plugin manager's instructions, or simply clone to $VIMDIR/pack/all/start/vim-quickfix-conflicts to use vim's (v8+) built-in management.

Usage

Because we use the built-in quickfix list feature, all usual (:h cc) quickfix list commands are available, once the list has been populated by either :Conflicts or :ConflictsNext.

:Conflicts

Populate your quickfix list with all current git conflicts.

:ConflictsNext (:Cn)

Jump to next conflict marker. (The quickfix list will be automatically populated, no need to call :Conflicts first.)

Configuration

None!

About

Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker

Topics

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages