conflict-marker.vim VS tig

For merge conflicts, https://github.com/rhysd/conflict-marker.vim is so much easier to use than any any other diff tool.

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.

I use this plugin: https://github.com/rhysd/conflict-marker.vim

Related but I use tig, a TUI, a lot to examine the state of my working tree and index and stage/unstage/reset changes piecemeal. It works great.

I'd like to plug [tig](https://github.com/jonas/tig) for those who don't use emacs. I see lazygit recommended here too, but I've been using tig for years now and love it's simplicity.

Try tig

I'm normally a CLI git (and tig) user.

Sometimes when I work in command line I use tig (https://jonas.github.io/tig/). There is also similar tool lazygit (https://github.com/jesseduffield/lazygit)

And you accidently open a git TUI

tig +My custom command to fix MR comments by quickly editing an old commit's changes at the time when that commit was created. (Like a more controlled git-absorb that explicitly selects a commit to fixup and therefor avoids rebase-conflicts when squashing)

today I looked at tig which is a nice text based GUI, and I think I will never use git log again :-)

If you are looking for more interactivity while remaining on the commandline, have you looked at Tig? Tig has a view for browsing refs, and you can sort by date.