These instructions describe how to perform the weekly merge of team
members' local git repositories into the shared master branch and push
the updates to production for both the Rust backend server and the React
frontend.
Backend (Rust / Axum / SeaORM)
Local directory: /opt/server_generic_live
Remote: server_generic
Frontend (React.js / Tailwind)
Local directory: /opt/server_frontend_live
Remote: server_frontend
Both repositories are automatically copied to the corresponding
/opt/..._live directories upon push to their remotes. Once copied, the
new version becomes active.
Each developer should ensure their local working branch is
up-to-date before the merge.
# Navigate to your repository
cd /path/to/server_generic # or /path/to/server_frontend
# Fetch latest changes
git fetch origin
# Switch to your feature/development branch
git checkout my-feature-branch
# Rebase or merge the latest master
git rebase origin/master
# OR
git merge origin/master
# Resolve any conflicts, then test your code locally
cargo build # for backend
npm run build # for frontend
Once your local branch is clean and tested:
# Switch to master
git checkout master
# Merge your feature branch into master
git merge my-feature-branch
# Push master to origin
git push origin master
The merge lead (rotating responsibility) will:
Pull the latest master from all team members.
git fetch --all
git checkout master
git pull origin master
Merge all approved feature branches.
git merge feature_branch_1
git merge feature_branch_2
# ... continue for all branches included this week
Resolve conflicts and re-test.
Push the consolidated master branch.
git push origin master
After the master branch is pushed:
/opt/server_generic_live/opt/server_frontend_liveCheck that the services are running properly.
# Backend
systemctl status server_generic
# Frontend (served via nginx or node)
systemctl status server_frontend
If needed, restart:
sudo systemctl restart server_generic
sudo systemctl restart server_frontend
git push -f) to master.\