This document describes the release and hotfix process for MCPProxy.
main- Production-ready code, always deployablenext- Integration branch for ongoing development and refactoring workhotfix/x.y.z- Emergency fixes for production issues
When a critical bug is discovered in production:
# Create hotfix branch from the latest production tag
git checkout tags/vX.Y.Z
git checkout -b hotfix/X.Y.Z+1- Make the minimal necessary changes to fix the issue
- Test thoroughly in isolation
- Update version numbers if needed
# Commit your changes
git add .
git commit -m "hotfix: fix critical issue description"
# Tag the hotfix release
git tag -a vX.Y.Z+1 -m "Release vX.Y.Z+1: hotfix for critical issue"
# Push tag and branch
git push origin hotfix/X.Y.Z+1
git push origin vX.Y.Z+1# Switch to main and merge the hotfix
git checkout main
git merge hotfix/X.Y.Z+1
git push origin mainIMPORTANT: All hotfixes must be backported to the next branch to ensure ongoing development includes the fix.
# Switch to next and merge the hotfix
git checkout next
git merge hotfix/X.Y.Z+1
git push origin next# Delete the hotfix branch (optional)
git branch -d hotfix/X.Y.Z+1
git push origin --delete hotfix/X.Y.Z+1When ready to release accumulated features from next:
- Create a release PR from
next→main - Run full test suite and integration tests
- Update version numbers and changelog
- Merge to
mainafter approval - Tag the release on
main - Deploy to production environment
- Feature branches should be created from and merged into
next mainshould only receive hotfixes and vetted releases fromnext- All hotfixes applied to
mainmust be backported tonext
- Production Environment: Deploys from
mainbranch tags - Staging Environment: Deploys from
nextbranch for testing
- Keep hotfixes minimal and focused
- Always test hotfixes in staging first if possible
- Document the issue and fix in the commit message
- Never forget to backport hotfixes to
next - Use semantic versioning for all releases
- Maintain a changelog for all releases