merge-branch-into-main

Merge Branch Into Main Command – Safe Branch Merging Workflow

When /merge-branch-into-main [branch-name] is invoked, immediately execute the following steps to safely merge a feature branch into the main branch.

---

Step 1: Load Project Context & Follow All Rules

1. Assume the project root as the working directory
2. Load and strictly follow ALL Cursor rules from .cursor/rules/*.mdc:
   • security.mdc - Security requirements
   • technical-stack.mdc - React Native/SQLite patterns
   • documentation.mdc - Documentation update requirements
   • version-management.mdc - Git commit/push workflow
   • general-principles.mdc - Project philosophy
3. Check current git status and branch
4. Read PROGRESS.md to understand current project state

---

Step 2: Determine Branch to Merge

1. If branch name provided: Use <branch-name> from command
2. If no branch name provided:
   • Use current branch: git branch --show-current
   • If current branch is main or master, stop and ask which branch to merge
3. Validate branch name:
   • Branch must exist locally or remotely
   • Branch should not be main or master (cannot merge main into itself)
   • Branch should be a feature/fix/refactor branch

---

Step 3: Pre-Merge Safety Checks (Mandatory)

Before merging, perform these checks:

1. Check current branch status:

   git status
   

   • If there are uncommitted changes, stop and ask user to commit or stash first
   • Never merge with uncommitted changes

2. Verify branch exists:

   git branch -a | grep <branch-name>
   

   • If branch doesn't exist, stop and report error

3. Check if branch is already merged:

   git branch --merged main
   

   • If branch is already merged, inform user and skip merge

4. Ensure main branch is up to date:

   git checkout main
   git pull origin main
   

   • Always merge into the latest main branch

5. Check for conflicts (dry run):

   git merge --no-commit --no-ff <branch-name>
   git merge --abort