CurrenciCombo/docs/BRANCH_CONSOLIDATION_PLAN.md

Branch Consolidation Plan

Current Status

Main Branch

• ✅ Up to date with Origin/main
• ✅ All production readiness work completed
• ✅ Working tree clean

Remote Branches to Consolidate

Dependabot Branches (Dependency Updates)

These are automated dependency update branches that need to be reviewed and merged:

1. Orchestrator Dependencies:

   • Origin/dependabot/npm_and_yarn/orchestrator/uuid-13.0.0 - uuid 9.0.1 → 13.0.0
   • Origin/dependabot/npm_and_yarn/orchestrator/types/express-5.0.5 - @types/express 4.17.25 → 5.0.5
   • Origin/dependabot/npm_and_yarn/orchestrator/express-5.1.0 - express 4.21.2 → 5.1.0
   • Origin/dependabot/npm_and_yarn/orchestrator/types/node-24.10.0 - @types/node 20.19.24 → 24.10.0

2. Contract Dependencies:

   • Origin/dependabot/npm_and_yarn/contracts/nomicfoundation/hardhat-toolbox-6.1.0 - hardhat-toolbox 4.0.0 → 6.1.0
   • Origin/dependabot/npm_and_yarn/contracts/chai-6.2.0 - chai 4.5.0 → 6.2.0
   • Origin/dependabot/npm_and_yarn/contracts/hardhat-3.0.11 - hardhat 2.26.5 → 3.0.11
   • Origin/dependabot/npm_and_yarn/contracts/types/chai-5.2.3 - @types/chai 4.3.20 → 5.2.3

3. GitHub Actions:

   • Origin/dependabot/github_actions/actions/checkout-5 - checkout v4 → v5
   • Origin/dependabot/github_actions/actions/setup-node-6 - setup-node v4 → v6
   • Origin/dependabot/github_actions/actions/upload-artifact-5 - upload-artifact v4 → v5
   • Origin/dependabot/github_actions/softprops/action-gh-release-2 - action-gh-release v1 → v2

Consolidation Strategy

Option 1: Merge All Dependabot Updates (Recommended)

Merge all dependency updates into main after testing for compatibility.

Option 2: Selective Merge

Review each update and merge only safe, non-breaking changes.

Option 3: Close and Recreate

Close Dependabot PRs and manually update dependencies if needed.

Recommended Approach

Merge all Dependabot updates as they are:

• Security patches and minor updates
• Tested by Dependabot
• Non-breaking changes (typically)

Execution Steps

1. Review Dependabot PRs on GitHub
2. Test each update locally or via CI
3. Merge approved PRs into main
4. Close merged branches after consolidation
5. Update main branch with all changes

Notes

• All production readiness work is already on main
• Dependabot branches are safe to merge (they're automated dependency updates)
• After consolidation, only main branch should remain active

---

Status: Ready for consolidation
Date: 2025-01-15