ship

Save progress, commit changes, and merge into main in one action.

25|4|Updated Sep 5, 2010

Search Tags:#automation #git #workflow #commit #merge #ship

Ready to run

npx skills add https://github.com/divad12/dotfiles --skill ship-divad12

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: ship
Source: https://github.com/divad12/dotfiles/tree/main/.claude/skills/ship
Command: npx skills add https://github.com/divad12/dotfiles --skill ship-divad12

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill streamlines the end-to-workflow process by chaining save, commit, and merge into a single user-triggered action, ensuring progress is recorded and changes are integrated into main without manual steps.

Core Features & Use Cases

Saves current session progress to PROGRESS.md so records are up-to-date.
Commits all relevant changes with a concise message in the repo style.
Merges the new commits into main, fast-forwarding when possible.
Use case: When you finish a task and want to lock in changes and integrate them into main with a single command.

Quick Start

Type "ship" to save progress, commit changes, and merge into the main branch.

Frequently Asked Questions about ship

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I automate git commit and merge into main in one step?▼

To automate git commit and merge into main in one step, invoke the ship command. It saves your session progress to PROGRESS.md, commits changes with a concise message, and fast-forwards the merge into main automatically.

What is the best way to save local development progress before merging a branch?▼

The best way to save local development progress before merging is to record it in PROGRESS.md. This ensures your session state is up-to-date and locked in before changes are committed and integrated into the main branch.

How does an automated git workflow handle merge failures?▼

An automated git workflow handles merge failures by stopping immediately. The process runs in three deterministic steps and halts on failure to ensure safety, preventing incomplete or conflicting changes from being integrated into main.

Can I fast-forward a merge into main without manual git commands?▼

Yes, you can fast-forward a merge into main without manual git commands. The workflow attempts to fast-forward when possible, integrating your new commits into the main branch automatically after committing.

When do I need a single command to save, commit, and merge my work?▼

You need a single command to save, commit, and merge your work when you finish a task and want to lock in changes. It is applicable after local development iterations or reviews to integrate finalized progress into main.