Skip to content
cccskills
FreePublished on GitHub

merge-master

Merge dev branch into master/main and push. Use when dev changes are ready for production branch. Invoked by saying "merge to master" or "merge to main".

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md1.1 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

Merge Dev into Master

Merge the dev branch into master (or main) and push. Includes safety checks.


Steps

  1. Ensure all dev changes are pushed — run git status and git log origin/dev..dev. If there are unpushed commits, push them first (with user approval).

  2. Switch to master/main:

    git checkout master   # or main
    git pull origin master
    
  3. Merge dev:

    git merge dev --no-ff -m "merge(dev→master): <summary>"
    

    If there are conflicts, report them and wait for user instructions.

  4. Push master:

    git push origin master
    
  5. Switch back to dev:

    git checkout dev
    

Rules

  • Only merge pushed changes. Never merge uncommitted or unpushed work.
  • Never force push to master/main.
  • If merge conflicts occur, STOP and report. Do not auto-resolve.
  • Always push immediately after merging.
  • Switch back to dev when done.

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

commit

Free

Stage, commit, and push code changes with branch safety and explicit staging. Use when ready to commit work. Invoked by saying "commit", "push", or "commit and push".

The English summary is being prepared. Showing the original description.

savedpixel/ai-agent-rules-generator8Updated Apr 12, 2026

Batch-commit all uncommitted changes grouped by relevance. Use when multiple accumulated changes need committing. Invoked by saying "commit all" or "commit everything".

The English summary is being prepared. Showing the original description.

savedpixel/ai-agent-rules-generator8Updated Apr 12, 2026

Document completed work — update task log, sync documentation, log observations. Use after finishing a task or batch of changes.

The English summary is being prepared. Showing the original description.

savedpixel/ai-agent-rules-generator8Updated Apr 12, 2026

Execute a previously created implementation plan — implement, test, document, and close out. Use when a plan file exists and is ready for implementation.

The English summary is being prepared. Showing the original description.

savedpixel/ai-agent-rules-generator8Updated Apr 12, 2026

Create a detailed implementation plan before coding. Use when starting a new feature, multi-step refactor, or complex task. Invoked by saying "plan", "create a plan", or "plan this task".

The English summary is being prepared. Showing the original description.

savedpixel/ai-agent-rules-generator8Updated Apr 12, 2026

report

Free

Generate a structured report on completed work, a feature area, or a topic. Saved to the reports directory. Invoked by saying "report", "generate report", or "summarize work".

The English summary is being prepared. Showing the original description.

savedpixel/ai-agent-rules-generator8Updated Apr 12, 2026

See all skills by savedpixel

Report a problem with this skill