Files
2026-04-08 13:16:57 +02:00

39 lines
1.1 KiB
Markdown

# KickAssMarket Deployment Workflow
## Rule: ALL updates go to `develop` branch FIRST → then merge to `main` for production
### Push commands (from Horus VPS):
```bash
cd /var/www/kickassmarket
# Push to develop (beta/testing)
git checkout develop
git add -A && git commit -m "your changes"
GIT_SSH_COMMAND="ssh -i ~/.ssh/id_github" git push -u origin develop
# After approval → merge to main (production)
git checkout main
git merge develop
GIT_SSH_COMMAND="ssh -i ~/.ssh/id_github" git push origin main
```
### Git branches:
- `develop` — beta/testing (all changes land here first)
- `main` — production (only merge after approval)
### Current status:
- ✅ Initial commit pushed to `develop` branch
- ⚠️ `main` branch needs to be created and protected
- SSH key: `~/.ssh/id_github` — already added to GitHub
### GitHub repo:
https://github.com/HaithamEKhalifa/KickAssMarket.com
### To do (manual):
1. Go to GitHub repo → Settings → Branches → Add rule for `main`
2. Enable "Require pull request reviews before merging"
3. Enable "Require linear history" (optional)
---
**Last deploy:** 2026-04-08 — Initial commit (develop branch)