GitHub

Branch strategy for supporting multiple versions:

• dev: Classic (pre-redesign) version
• v0.6.x-ux-ui-design: All UI/Tailwind redesign work
• main: Stable, working version (production or latest release)

How to manage this setup:¶

1. Classic updates:

2. Work in dev for bugfixes, backend changes, or features that don't touch the new UI.

3. Merge backend-only changes into main and v0.6.x-ux-ui-design as needed.

4. UI/UX redesign:

5. All Tailwind, new templates, and design changes go in v0.6.x-ux-ui-design.

6. Merge backend changes from dev into this branch regularly to keep it up to date.

7. Main branch:

8. Use for releases or production.

9. Merge from dev (for classic) or from v0.6.x-ux-ui-design when you want to ship the new UI.

Tips:¶

• Use git merge dev in v0.6.x-ux-ui-design to bring backend changes over.
• Use git cherry-pick for selective commits.
• Only merge v0.6.x-ux-ui-design into main when you want the new UI live.

Summary:

• Keep branches isolated for their purpose.
• Merge backend changes across branches as needed.
• Merge UI branch into main only when ready for release.