connect floating button to a menu and contribute to that from git

extensions/git/package.json

@@ -11,6 +11,7 @@
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "enabledApiProposals": [
     "diffCommand",
+    "contribMergeEditorToolbar",
     "contribViewsWelcome",
     "scmActionButton",
     "scmSelectedProvider",
@@ -550,6 +551,11 @@
         "command": "git.api.getRemoteSources",
         "title": "%command.api.getRemoteSources%",
         "category": "Git API"
+      },
+      {
+        "command": "git.acceptMerge",
+        "title": "%command.git.acceptMerge%",
+        "category": "Git"
       }
     ],
     "keybindings": [
@@ -1419,6 +1425,12 @@
           "when": "isInDiffRightEditor && !isInEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
         }
       ],
+      "merge/toolbar": [
+        {
+          "command": "git.acceptMerge",
+          "when": "isMergeEditor"
+        }
+      ],
       "scm/change/title": [
         {
           "command": "git.stageChange",