avil13-co 2.2.0 → 2.2.1

package/dist/index.js

@@ -4,6 +4,7 @@ const ask_1 = require("./ask");
 const cli_commands_1 = require("./cli-commands");
 const commands_1 = require("./commands");
 const delete_barnch_1 = require("./commands/delete-barnch");
+const merge_branch_1 = require("./commands/merge-branch");
 const run = async () => {
     const userWish = (0, cli_commands_1.getWishOfUser)();
     if (cli_commands_1.Commands.Help === userWish) {
@@ -23,6 +24,10 @@ const run = async () => {
         (0, delete_barnch_1.deleteBranch)(branch);
         return;
     }
+    if (cli_commands_1.Commands.MergeBranch === userWish) {
+        (0, merge_branch_1.mergeBranch)(branch);
+        return;
+    }
     await (0, commands_1.checkoutBranch)(branch);
     await (0, commands_1.getCurrentBranchName)();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avil13-co",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "",
   "main": "dist/index.js",
   "public": true,

package/src/index.ts

@@ -2,6 +2,7 @@ import { ask } from './ask';
 import { Commands, getHelp, getWishOfUser } from './cli-commands';
 import { BranchesType, checkoutBranch, getBranches, getCurrentBranchName } from './commands';
 import { deleteBranch } from './commands/delete-barnch';
+import { mergeBranch } from './commands/merge-branch';
 
 const run = async () => {
   const userWish = getWishOfUser();
@@ -28,6 +29,11 @@ const run = async () => {
     return;
   }
 
+  if (Commands.MergeBranch === userWish) {
+    mergeBranch(branch);
+    return;
+  }
+
   await checkoutBranch(branch);
 
   await getCurrentBranchName()