/merge-main

From him0-git-ops

Description

Fetch and merge the default branch into current branch with auto conflict resolution

AI Summary

Merges default branch into current branch with automatic conflict resolution.

Install

Add the repository(one-time)

/plugin marketplace add him0/him0-claude-marketplace

Install the plugin

/plugin install him0-git-ops@him0-claude-marketplace

Argument

[--rebase | -r] [--no-auto-resolve]

Allowed Tools

TodoWriteReadWriteEditGrepGlobAskUserQuestionBash(gh repo view *)Bash(git fetch *)Bash(git merge *)Bash(git rebase *)Bash(git status *)Bash(git diff *)Bash(git log *)Bash(git rev-parse *)Bash(git branch *)Bash(git checkout *)Bash(git add *)Bash(git reset *)

Command Content

Quick Reference

/merge-main                    # Merge default branch into current branch
/merge-main --rebase           # Rebase onto default branch
/merge-main --no-auto-resolve  # Skip auto conflict resolution

Workflow

Pre-check: Ensure working tree is clean and not on default branch
Fetch and merge: git fetch then git merge (or git rebase with -r)
Conflict resolution: Auto-resolve conflicts unless --no-auto-resolve
- If auto-resolution fails, ask user for guidance
Report: Summary of merged commits and resolved conflicts

Links

GitHub Stats

0 forks

Updated 8 days ago