diff options
| -rw-r--r-- | pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index 9cb8f4a15..981b85a0d 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -218,7 +218,10 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.RebaseBranch) err := self.git.Rebase.EditRebase(ref) - return self.CheckMergeOrRebase(err) + if err = self.CheckMergeOrRebase(err); err != nil { + return err + } + return self.c.PushContext(self.contexts.LocalCommits) }, }, } |