diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 18:57:35 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 20:07:46 +1000 |
| commit | bfaf1c4f709505cb60b9f4c9cb813a4c816b7fec (patch) | |
| tree | 4c150506121ea882fb973c2eb0abe10fa9663673 | |
| parent | 2d18d089ce046e7f858b8d1e41469350f879d49c (diff) | |
use remote prefixed branch name when merging remote branch
| -rw-r--r-- | pkg/gui/remote_branches_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |