go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

Show confirmation menu when trying to amend changes while there are conflicts

Browse Source
This commit is contained in:
Stefan Haller
2025-01-28 18:29:38 +01:00
parent c0e3922d02
commit 0a78d0016e
8 changed files with 269 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@ -77,6 +77,10 @@ func (self *MergeAndRebaseHelper) CreateRebaseOptionsMenu() error {
return self.c.Menu(types.CreateMenuOptions{Title: title, Items: menuItems})
}
func (self *MergeAndRebaseHelper) ContinueRebase() error {
return self.genericMergeCommand(REBASE_OPTION_CONTINUE)
}
func (self *MergeAndRebaseHelper) genericMergeCommand(command string) error {
status := self.c.Git().Status.WorkingTreeState()