arisguimera Finishing a Mobile Development Branch
Overview
Guide completion of development work by presenting clear options and handling chosen workflow.
Core principle: Verify tests → Present options → Execute choice → Clean up.
Announce at start: "I'm using the mobile-finishing-branch skill to complete this work."
The Process
Step 1: Verify Tests
Before presenting options, verify tests pass:
| Platform | Test command |
|---|---|
| Android | ./gradlew testDebugUnitTest |
| iOS | xcodebuild test -scheme <Scheme> -destination 'platform=iOS Simulator,name=iPhone 16' |
| Flutter | flutter test |
| React Native | npx jest |
| KMP | ./gradlew allTests |
For multi-platform projects: verify EACH platform separately.
If tests fail: Stop. Don't proceed to Step 2.
If tests pass: Continue to Step 2.
Step 2: Determine Base Branch
Do NOT assume main or master.
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
Or ask: "This branch split from main — is that correct?"
Step 3: Present Options
Present exactly these 4 options:
Implementation complete. What would you like to do?
1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work
Which option?
Don't add explanation — keep options concise.
Step 4: Execute Choice
Option 1: Merge Locally
git checkout <base-branch>
git pull
git merge <feature-branch>
# Verify tests on merged result
git branch -d <feature-branch>
Then: Cleanup worktree (Step 5)
Option 2: Push and Create PR
git push -u origin <feature-branch>
Then use the mobiai-create-pr skill for proper mobile PR structure.
Then: Cleanup worktree (Step 5)
Option 3: Keep As-Is
Report: "Keeping branch . Worktree preserved at ."
Don't cleanup worktree.
Option 4: Discard
Confirm first:
This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>
Type 'discard' to confirm.
Wait for exact confirmation. If confirmed:
git checkout <base-branch>
git branch -D <feature-branch>
Then: Cleanup worktree (Step 5)
Step 5: Cleanup Worktree
For Options 1, 2, 4:
git worktree remove <worktree-path>
For Option 3: Keep worktree.
Quick Reference
| Option | Merge | Push | Keep Worktree | Cleanup Branch |
|---|---|---|---|---|
| 1. Merge locally | yes | - | - | yes |
| 2. Create PR | - | yes | yes | - |
| 3. Keep as-is | - | - | yes | - |
| 4. Discard | - | - | - | yes (force) |
Common Mistakes
- Skipping test verification — merge broken code
- Open-ended questions — "What should I do?" → present exactly 4 options
- No confirmation for discard — require typed "discard"
- Assuming base branch — always verify
Red Flags
Never:
- Proceed with failing tests
- Merge without verifying tests on result
- Delete work without confirmation
- Force-push without explicit request
Integration
Called by:
mobiai-mobile-executing-plans-with-subagents- After all tasks completemobiai-mobile-executing-plans- After all tasks complete
Pairs with:
mobiai-mobile-worktrees- Cleans up worktree created by that skill