Version: v2

✅ Completed: `main` Branch Consolidation

Completed Date: Tuesday, July 7, 2026
Team: CCG Contributors
Status: ✅ Completed
Owner: Syamala

Update Complete

The branch consolidation is complete. main is now the default and active branch going forward.

📋 What Was Done?

On Tuesday July 7, develop was consolidated into main.

main is now the repository default branch and the active working branch going forward.

💡 Why Are We Doing This?

Reason	Detail
CI/CD default branch	GitHub Actions deployment workflows are triggered from the repository's default branch. Having the default branch (`main`) diverge from the working branch (`develop`) creates unnecessary complexity.
Industry standard	It is good practice to keep `main` as the default and authoritative branch.
Reduces confusion	Contributors cloning the repo or opening PRs land on `main` by default. After consolidation, this will reflect the current working state.

🔖 Backup Tags

Both branches were tagged at their previous state before consolidation. These tags remain available permanently.

Tag	Branch	Link
`backup/develop-before-consolidation`	`develop`	View tag
`backup/main-before-consolidation`	`main`	View tag

Tags are permanent rollback points

If anything goes wrong after consolidation, these tags can be used to restore either branch to its pre-consolidation state.

🌿 Current Branch State

Branch	Before	Now
`main`	Locked, stale (pre-restructure state)	Default and active working branch
`develop`	Active working branch	Consolidated into `main`

New pull requests should target main
Local workflows, scripts, and branch references should now use main

✅ What You Need To Do Now

Run git fetch origin --prune to sync branch references locally
Switch to main and pull latest
If your local workflow still references develop, update scripts/configs to main

git fetch origin
git checkout main
git pull origin main

📚 Resources

Resource	Link
Merchant Internal Content Guide	View Guide
Branch Protection Settings	(GitHub → Repo Settings → Branches)
Dev Environment	docs.healthsafepay.com
Test Environment	developers.healthsafepay.com

🏁 Bottom Line

Consolidation complete: main is now the default and active branch.
Update local references from develop to main where needed.
Backup tags remain available as rollback points.

Previous: Branch & Deployment Restructure (June 26)

Please align all ongoing work to main going forward.

📋 What Was Done?​

💡 Why Are We Doing This?​

🔖 Backup Tags​

🌿 Current Branch State​

✅ What You Need To Do Now​

📚 Resources​

🏁 Bottom Line​

🔗 Related​