akinsho / akinsho/git-conflict.nvim

Feature: Choose Ours/Theirs/Both for entire File

Offen
#34 10 Kommentare 0 Reaktionen 0 zugewiesene Personen Auf GitHub ansehen
Vorherrschende Sprache
Lua
Sterne
1.4k
Forks
70
PR-Merge-Kennzahlen
Keine gemergten PRs in 30 T.

Beschreibung

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.

Beitragsleitfaden

Für dieses Repository ist kein Beitragsleitfaden indexiert

Bewertung

Dieses Issue wurde noch nicht bewertet.

Neue Issues direkt in Ihr Postfach

Eine kurze Übersicht über anfängerfreundliche GitHub-Issues.