https://github.com/ojford/vim-quickfix-conflicts
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
https://github.com/ojford/vim-quickfix-conflicts
conflict-resolution conflicts git quickfix vim
Last synced: 13 days ago
JSON representation
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
- Host: GitHub
- URL: https://github.com/ojford/vim-quickfix-conflicts
- Owner: OJFord
- License: mit
- Created: 2019-06-21T09:26:38.000Z (over 5 years ago)
- Default Branch: master
- Last Pushed: 2019-09-27T12:47:37.000Z (over 5 years ago)
- Last Synced: 2024-12-16T06:25:41.579Z (2 months ago)
- Topics: conflict-resolution, conflicts, git, quickfix, vim
- Language: Vim script
- Size: 4.88 KB
- Stars: 0
- Watchers: 3
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# 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!