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

Replace PushContext() with Context().Push()

Browse Source
This commit is contained in:
Stefan Haller
2024-08-08 10:16:56 +02:00
parent d89dc967b8
commit bd36b8a95e
31 changed files with 36 additions and 41 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

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