akinsho / akinsho/git-conflict.nvim
Feature: Choose Ours/Theirs/Both for entire File
Aberta
- Linguagem predominante
- Lua
- Estrelas
- 1.4k
- Forks
- 70
- Métricas de merge de PRs
- Nenhum PR com merge em 30d
Descrição
I really like this plugin, only thing I wish it has would be some util functions Choose ours/theirs/both for the entire file. The use case is, I had a `yarn.lock` file where many conflicts occurred. It had over 400 conflicts which is actually normal for a larger codebase. Going to next conflict and resolving in this case is not feasible, I just created a quick macro and called it +400 times which worked but seems janky and inefficient. A command mode function for this situation seems appropriate.
Guia de contribuição
Nenhum guia de contribuição indexado para este repositório
Avaliação
Esta issue ainda não foi avaliada.