Focus branch view on tag merge

jesseduffield · Apr 11, 2024 · be3ee84 · be3ee84
1 parent 91a620c
commit be3ee84
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go
@@ -244,7 +244,15 @@ func (self *TagsController) create() error {
 }
 
 func (self *TagsController) merge(tag *models.Tag) error {
- return self.c.Helpers().MergeAndRebase.MergeRefIntoCheckedOutBranch(tag.RefName())
+ err := self.c.Helpers().MergeAndRebase.MergeRefIntoCheckedOutBranch(tag.RefName())
+ if err == nil {
+ context, ok := self.c.Helpers().View.ContextForView("localBranches")
+ if !ok {
+ return nil
+ }
+ err = self.c.PushContext(context)
+ }
+ return err
 }
 
 func (self *TagsController) context() *context.TagsContext {