From 2c40858663d8e47e4c514629fbae442bd405e2df Mon Sep 17 00:00:00 2001 From: Skyler Lehmkuhl Date: Sun, 21 Jun 2026 18:13:02 -0400 Subject: [PATCH] docs: point branch references at master rust-ui is being merged into master and retired as the primary branch. Update README, ARCHITECTURE, and CONTRIBUTING to reference master. Co-Authored-By: Claude Opus 4.8 (1M context) --- ARCHITECTURE.md | 2 +- CONTRIBUTING.md | 13 ++++++------- README.md | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 7da90d8..945104b 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -52,7 +52,7 @@ Lightningbeam is a 2D multimedia editor combining vector animation, audio produc Lightningbeam is undergoing a rewrite from a Tauri/JavaScript prototype to pure Rust. The original architecture hit IPC bandwidth limitations when streaming decoded video frames. The new Rust UI eliminates this bottleneck by handling all rendering natively. -**Current Status**: Active development on the `rust-ui` branch. Core UI, tools, and undo system are implemented. Audio integration in progress. +**Current Status**: Active development on the `master` branch. Core UI, tools, undo system, and audio integration are implemented. ## Technology Stack diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 12a96ec..bcb6d18 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,17 +130,16 @@ lightningbeam-2/ ### Branching Strategy -- `main` - Stable branch -- `rust-ui` - Active development branch for Rust UI rewrite -- Feature branches - Create from `rust-ui` for new features +- `master` - Main development branch +- Feature branches - Create from `master` for new features ### Before You Start 1. Check existing issues or create a new one to discuss your change -2. Make sure you're on the latest `rust-ui` branch: +2. Make sure you're on the latest `master` branch: ```bash - git checkout rust-ui - git pull origin rust-ui + git checkout master + git pull origin master ``` 3. Create a feature branch: ```bash @@ -241,7 +240,7 @@ this solution. ### Pull Request Process 1. Push your branch to GitHub or Gitea -2. Open a pull request against `rust-ui` branch +2. Open a pull request against `master` branch - GitHub: https://github.com/skykooler/lightningbeam - Gitea: https://git.skyler.io/skyler/lightningbeam 3. Provide a clear description of: diff --git a/README.md b/README.md index cf9afb3..ee4c7ee 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ A free and open-source 2D multimedia editor combining vector animation, audio pr ## Project Status -Lightningbeam is under active development on the `rust-ui` branch. The project has been rewritten from a Tauri/JavaScript prototype to a pure Rust application to eliminate IPC bottlenecks and achieve better performance for real-time video and audio processing. +Lightningbeam is developed on the `master` branch. The project has been rewritten from a Tauri/JavaScript prototype to a pure Rust application to eliminate IPC bottlenecks and achieve better performance for real-time video and audio processing. **Current Status:** - ✅ Core UI panes (Stage, Timeline, Asset Library, Info Panel, Toolbar)