Skip to content

fix: handle discard conflict with delete #1994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CKolkey merged 1 commit into from
Jul 22, 2026
+24 −8
Merged

fix: handle discard conflict with delete #1994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions lua/neogit/buffers/status/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,11 +841,19 @@ M.n_discard = function(self)
input.get_choice("Discard conflict by taking...", { values = choices, default = #choices })

if choice == "o" then
git.cli.checkout.ours.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
if selection.item.mode:sub(1, 1) == "D" then
git.cli.rm.files(selection.item.absolute_path).call { await = true }
else
git.cli.checkout.ours.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
end
elseif choice == "t" then
git.cli.checkout.theirs.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
if selection.item.mode:sub(2, 2) == "D" then
git.cli.rm.files(selection.item.absolute_path).call { await = true }
else
git.cli.checkout.theirs.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
end
elseif choice == "c" then
git.cli.checkout.merge.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
Expand All @@ -872,11 +880,19 @@ M.n_discard = function(self)
input.get_choice("Discard conflict by taking...", { values = choices, default = #choices })

if choice == "o" then
git.cli.checkout.ours.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
if selection.item.mode:sub(1, 1) == "D" then
git.cli.rm.files(selection.item.absolute_path).call { await = true }
else
git.cli.checkout.ours.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
end
elseif choice == "t" then
git.cli.checkout.theirs.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
if selection.item.mode:sub(2, 2) == "D" then
git.cli.rm.files(selection.item.absolute_path).call { await = true }
else
git.cli.checkout.theirs.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
end
elseif choice == "c" then
git.cli.checkout.merge.files(selection.item.absolute_path).call { await = true }
git.status.stage { selection.item.name }
Expand Down
Loading