merge-to-cp

To merge an approved git ticket branch into a CP branch, the workflow validates ticket status and acceptance criteria, switches to the CP branch, performs a no-ff merge, and pushes after successful tests.

A no-ff merge creates a merge commit instead of fast-forwarding, preserving branch history. It is required for CP branches to enforce coding workflow hard rules and ensure full traceability of merged work items.

No, you cannot use this workflow to merge tickets into main or master. It enforces hard coding workflow rules to prevent merging into main/master and restricts automated ticket merges to the CP branch only.

No, you do not need to manually run tests before merging a ticket into the CP branch. The workflow performs a no-ff merge and pushes to the remote only after a successful test run validates the completed work.

After a successful CP branch merge, the workflow automatically updates the ticket status. It reads ticket and RTM docs during validation and marks the ticket status as done upon a successful merge.