mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 04:45:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Provide conflict resolution dialogs for non-textual conflicts

Browse source
This commit is contained in:
Stefan Haller 2025-03-27 15:31:45 +01:00
parent efcd71b296
commit ebb576feac
5 changed files with 168 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/commands/git_commands/working_tree.go
View file

@ -341,6 +341,13 @@ func (self *WorkingTreeCommands) RemoveTrackedFiles(name string) error {
return self.cmd.New(cmdArgs).Run()
}
func (self *WorkingTreeCommands) RemoveConflictedFile(name string) error {
cmdArgs := NewGitCmd("rm").Arg("--", name).
ToArgv()
return self.cmd.New(cmdArgs).Run()
}
// RemoveUntrackedFiles runs `git clean -fd`
func (self *WorkingTreeCommands) RemoveUntrackedFiles() error {
cmdArgs := NewGitCmd("clean").Arg("-fd").ToArgv()