hsh19900502 1.0.7 → 1.0.8

package/dist/commands/git.d.ts

@@ -1,3 +1,4 @@
 import 'zx/globals';
 export declare const gcm: (message: string, isPush?: boolean) => Promise<void>;
+export declare const merge: (branch: string) => Promise<void>;
 export declare const push: () => Promise<void>;

package/dist/commands/git.js

@@ -9,6 +9,18 @@ export const gcm = async function (message, isPush) {
         await push();
     }
 };
+export const merge = async (branch) => {
+    const currentBranch = (await $ `git branch --show-current`).stdout.trim();
+    if (currentBranch === branch) {
+        console.warn(chalk.yellow('Current branch is the same as the branch to be merged'));
+        return;
+    }
+    await $ `git checkout ${branch}`;
+    await $ `git pull origin ${branch}`;
+    await $ `git checkout ${currentBranch}`;
+    await $ `git merge ${branch}`;
+    console.log(chalk.green('Merged branch into current branch successfully!\n'));
+};
 export const push = async function () {
     const question = [
         {

package/dist/hsh.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { gcm, push } from './commands/git.js';
+import { gcm, merge, push } from './commands/git.js';
 import { Command } from 'commander';
 import packageJson from '../package.json' assert { type: "json" };
 import { initMonoRepo, monoCd } from './commands/mono.js';
@@ -21,6 +21,12 @@ program
     .action(() => {
     push();
 });
+program.command('merge')
+    .description('merge branch into current branch')
+    .argument('<branch>')
+    .action((branch) => {
+    merge(branch);
+});
 const mono = program.command('mono').description('multi repo management');
 mono.command('init').description('init mono repo').action(() => {
     initMonoRepo();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsh19900502",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/commands/git.ts

@@ -12,6 +12,19 @@ export const gcm = async function (message: string, isPush?: boolean): Promise<v
   }
 };
 
+export const merge = async (branch: string) => {
+  const currentBranch = (await $`git branch --show-current`).stdout.trim()
+  if(currentBranch === branch) {
+    console.warn(chalk.yellow('Current branch is the same as the branch to be merged'));
+    return;
+  }
+  await $`git checkout ${branch}`;
+  await $`git pull origin ${branch}`;
+  await $`git checkout ${currentBranch}`;
+  await $`git merge ${branch}`;
+  console.log(chalk.green('Merged branch into current branch successfully!\n'));
+}
+
 interface BranchQuestion {
   type: 'input';
   name: 'branch';

package/src/hsh.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { gcm, push } from './commands/git.js';
+import { gcm, merge, push } from './commands/git.js';
 import { Command } from 'commander';
 import packageJson from '../package.json' assert { type: "json" };
 import { initMonoRepo, monoCd } from './commands/mono.js';
@@ -27,6 +27,13 @@ program
     push();
   });
 
+program.command('merge')
+  .description('merge branch into current branch')
+  .argument('<branch>')
+  .action((branch: string) => {
+    merge(branch);
+  })
+
 const mono = program.command('mono').description('multi repo management')
 mono.command('init').description('init mono repo').action(() => {
   initMonoRepo();