c3f43d8b61
- Add 60 new agents across all 10 categories (75 -> 135) - Add 95 new plugins with command files (25 -> 120) - Update all agents to use model: opus - Update README with complete plugin/agent tables - Update marketplace.json with all 120 plugins
1.3 KiB
1.3 KiB
Complete a feature/bugfix/hotfix flow by merging back to the target branch.
Steps
- Detect the current branch type from the prefix (feature/, bugfix/, hotfix/).
- Run pre-merge checks:
- All tests pass.
- No merge conflicts with the target branch.
- Branch is up to date with the target.
- Determine the merge target:
- feature/bugfix: merge to
developormain. - hotfix: merge to both
mainanddevelop.
- feature/bugfix: merge to
- Create a pull request if one does not exist:
gh pr create --base <target> --title "<type>: <description>".
- If auto-merge is requested:
- Rebase on target:
git rebase origin/<target>. - Merge with no-ff:
git merge --no-ff <branch>. - Tag if hotfix:
git tag -a v<version> -m "Hotfix: <description>".
- Rebase on target:
- Clean up: delete the feature branch locally and remotely.
- For hotfix, cherry-pick to develop if not merged there.
Format
Flow completed:
Branch: <branch-name>
Merged to: <target-branch>
PR: <url>
Tag: <tag if hotfix>
Cleanup: branch deleted
Changes:
- <N> commits, <N> files changed
Rules
- Never merge without passing tests and CI checks.
- Use
--no-ffmerges to preserve branch history in the merge graph. - Tag hotfix releases immediately after merging to main.
- Ensure hotfix changes also reach the develop branch.
- Confirm before deleting branches with unmerged commits.