Can someone make a conflict marker plugin in lua please.

• conflict-marker.vim

  6 460 0.0 Vim Script

  Weapon to fight against conflicts in Vim.

To all plugin devs, sometimes highlighting the conflict markers would be great. I would like a similar workflow like in vscode. The closest I found was the following, but unfortunately it's hard to get it to work with a modern color scheme. See the following issue.

• vim-fugitive

  114 19,314 8.1 Vim Script

  fugitive.vim: A Git wrapper so awesome, it should be illegal

Not an answer to your question but wouldn't fugitive conflict diff view collapse already anything that isn't a conflict, only leaving the markers in fact? And :diffget (or :diffput, respectively) resolve the conflict directly with whichever piece of code you want to keep? Then you just need to jump to the next conflict market, which you can easily do with mapping a search to the markers string.

• InfluxDB

  www.influxdata.com featured

  Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.

  

Suggest a related project