Mergito

A CLI tool that helps you merge Git branches.

Mergito merges your current branch into a target branch, then returns you to where you started. It checks out the target branch, pulls the latest changes (if it tracks an upstream), merges your branch in, pushes the result, and switches back to your original branch. If the merge conflicts, it aborts cleanly and leaves you back on your branch.

Usage

mergito [targetBranch] [options]

targetBranch is optional and defaults to staging:

mergito          # merges into staging
mergito main     # merges into main

Show help:

mergito --help

Local development

Clone the repository and install dependencies:

pnpm install

Build the CLI:

pnpm build

Run without installing globally

node dist/index.js staging

While developing, you can recompile automatically in one terminal:

pnpm dev

Then run the CLI from another terminal after each change:

pnpm build && node dist/index.js staging

Install globally from your local checkout

To use the mergito command anywhere on your machine without publishing to npm:

pnpm build
pnpm add -g .

Then run it like any other CLI tool:

mergito staging
mergito --help

To remove the global install:

pnpm remove -g mergito

If the command is not found after installing globally, run pnpm setup and restart your terminal so pnpm's global bin directory is on your PATH.