Poll: how do you jump to Git conflict markers?

• diffview.nvim

  61 3,363 6.1 Lua

  Single tabpage interface for easily cycling through diffs for all modified files for any git rev.

Please explain. I can see on https://github.com/sindrets/diffview.nvim that you can use Tab to cycle through changed files. And then you're right at the conflicts or how does it work?

• git-conflict.nvim

  10 783 7.4 Lua

  A plugin to visualise and resolve merge conflicts in neovim

I use akinsho/git-conflict and it does its job: minimal and efficient.

• 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.

  

• lazygit.nvim

  13 1,183 5.2 Lua

  Plugin for calling lazygit from within neovim.

So I use https://github.com/kdheepak/lazygit.nvim All of my git workflow is done in lazygit gg opens the float and away I go

• diffconflicts

  16 380 2.4 Vim Script

  A better Vimdiff Git mergetool

https://github.com/whiteinge/diffconflicts as a merge tool

• vim-fugitive

  114 19,314 8.1 Vim Script

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

vim-fugitve and it's great.

• SaaSHub

  www.saashub.com featured

  SaaSHub - Software Alternatives and Reviews. SaaSHub helps you find the best software and product alternatives

  

Suggest a related project