sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Remove return value of IContextMgr.Push/Pop et. al.

Browse Source
This commit is contained in:
Stefan Haller
2024-09-04 18:33:48 +02:00
parent 072b465fa6
commit 371998e635
42 changed files with 137 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,8 @@ func (self *MergeAndRebaseHelper) PromptForConflictHandling() error {
{
Label: self.c.Tr.ViewConflictsMenuItem,
OnPress: func() error {
return self.c.Context().Push(self.c.Contexts().Files)
self.c.Context().Push(self.c.Contexts().Files)
return nil
},
},
{
@ -346,7 +347,8 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
if err = self.ResetMarkedBaseCommit(); err != nil {
return err
}
return self.c.Context().Push(self.c.Contexts().LocalCommits)
self.c.Context().Push(self.c.Contexts().LocalCommits)
return nil
},
},
{