From be3ee84107ee7b0b4cd850a032c56715e808e810 Mon Sep 17 00:00:00 2001
From: RetoranPetra <flyro@live.co.uk>
Date: Mon, 8 Apr 2024 12:39:42 +0100
Subject: [PATCH] Focus branch view on tag merge

---
 pkg/gui/controllers/tags_controller.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go
index a1e905984e5..52e5af4012d 100644
--- 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 {