deploy-to-staging

To merge feature branches to staging across multiple repos, you must first sync the feature branch with master/main, then merge it into staging. This skill automates that cross-repo coordination by enforcing two-step merges: syncing base into feature, then merging feature into staging for eligible repos.

Handling merge conflicts during staging preparation requires a structured resolution strategy for import-only conflicts and code conflicts. This skill provides automated guidance for resolving conflicts during the two-step merge process, escalating complex code conflicts as needed to ensure stable staging deployments.

Yes, this multi-repo staging merge workflow supports backend, frontend, and chadmin-frontend repositories. It applies repository-specific rules: backend skips staging merges, frontend merges to staging, and chadmin-frontend uses main and staging branches for consistent deployment preparation.

Yes, you can automate backmerge and conflict resolution for multi-repo Git workflows. This skill orchestrates feature-branch sync, handles import-only and code conflicts with structured guidance, and pushes final changes across backend, frontend, and chadmin-frontend repositories automatically.

A two-step merge process is needed to ensure feature branches contain the latest base branch updates before staging deployment. By merging base into feature first, then feature into staging, you isolate conflicts early and maintain stable staging environments across multiple repositories.