diff options
Diffstat (limited to 'pkg/gui/controllers')
-rw-r--r-- | pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index ef9dd76a2..6d2c680e3 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -149,17 +149,12 @@ func (self *MergeAndRebaseHelper) CheckMergeOrRebase(result error) error { return nil } else if isMergeConflictErr(result.Error()) { return self.c.Confirm(types.ConfirmOpts{ - Title: self.c.Tr.FoundConflictsTitle, - Prompt: self.c.Tr.FoundConflicts, - HandlersManageFocus: true, + Title: self.c.Tr.FoundConflictsTitle, + Prompt: self.c.Tr.FoundConflicts, HandleConfirm: func() error { return self.c.PushContext(self.contexts.Files) }, HandleClose: func() error { - if err := self.c.PopContext(); err != nil { - return err - } - return self.genericMergeCommand(REBASE_OPTION_ABORT) }, }) |