refactor: reorder context menu items of selected branch

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Views/BranchTree.axaml.cs

@@ -753,6 +753,23 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                 menu.Items.Add(push);
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
+                var type = repo.GetGitFlowType(branch);
+                if (type != Models.GitFlowBranchType.None)
+                {
+                    var finish = new MenuItem();
+                    finish.Header = App.Text("BranchCM.Finish", branch.Name);
+                    finish.Icon = this.CreateMenuIcon("Icons.GitFlow.Finish");
+                    finish.IsEnabled = !repo.IsBare;
+                    finish.Click += (_, e) =>
+                    {
+                        if (repo.CanCreatePopup())
+                            repo.ShowPopup(new ViewModels.GitFlowFinish(repo, branch, type));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(finish);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                }
+
                 if (upstream != null)
                 {
                     var compareWithUpstream = new MenuItem();
@@ -858,6 +875,23 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                     menu.Items.Add(rebase);
                     menu.Items.Add(new MenuItem() { Header = "-" });
                     menu.Items.Add(interactiveRebase);
+
+                    var type = repo.GetGitFlowType(branch);
+                    if (type != Models.GitFlowBranchType.None)
+                    {
+                        var finish = new MenuItem();
+                        finish.Header = App.Text("BranchCM.Finish", branch.Name);
+                        finish.Icon = this.CreateMenuIcon("Icons.GitFlow.Finish");
+                        finish.IsEnabled = !repo.IsBare || !hasNoWorktree;
+                        finish.Click += (_, e) =>
+                        {
+                            if (repo.CanCreatePopup())
+                                repo.ShowPopup(new ViewModels.GitFlowFinish(repo, branch, type));
+                            e.Handled = true;
+                        };
+                        menu.Items.Add(new MenuItem() { Header = "-" });
+                        menu.Items.Add(finish);
+                    }
                 }
 
                 if (hasNoWorktree)
@@ -912,25 +946,6 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                 menu.Items.Add(compareWith);
             }
 
-            if (!repo.IsBare)
-            {
-                var type = repo.GetGitFlowType(branch);
-                if (type != Models.GitFlowBranchType.None)
-                {
-                    var finish = new MenuItem();
-                    finish.Header = App.Text("BranchCM.Finish", branch.Name);
-                    finish.Icon = this.CreateMenuIcon("Icons.GitFlow.Finish");
-                    finish.Click += (_, e) =>
-                    {
-                        if (repo.CanCreatePopup())
-                            repo.ShowPopup(new ViewModels.GitFlowFinish(repo, branch, type));
-                        e.Handled = true;
-                    };
-                    menu.Items.Add(new MenuItem() { Header = "-" });
-                    menu.Items.Add(finish);
-                }
-            }
-
             if (!branch.IsDetachedHead)
             {
                 var editDescription = new MenuItem();