From bfaf1c4f709505cb60b9f4c9cb813a4c816b7fec Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 12 Aug 2020 18:57:35 +1000 Subject: [PATCH] use remote prefixed branch name when merging remote branch --- pkg/gui/remote_branches_panel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gui/remote_branches_panel.go b/pkg/gui/remote_branches_panel.go index b5cc102b9..7e3330d7b 100644 --- a/pkg/gui/remote_branches_panel.go +++ b/pkg/gui/remote_branches_panel.go @@ -84,7 +84,7 @@ func (gui *Gui) handleCheckoutRemoteBranch(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleMergeRemoteBranch(g *gocui.Gui, v *gocui.View) error { - selectedBranchName := gui.getSelectedRemoteBranch().Name + selectedBranchName := gui.getSelectedRemoteBranch().FullName() return gui.mergeBranchIntoCheckedOutBranch(selectedBranchName) }