Proyecto-SaaS/django-core-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: corregir flujo de ramas en CLAUDE.md (pre-dev → dev → master)
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Details

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
juanjo
2026-04-17 01:15:04 +02:00
parent fbc5f0f6c4
commit 99de5f06b5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CLAUDE.md
View File

@@ -80,10 +80,17 @@ class MiVista(APIView):
pre-dev → dev → master pre-dev → dev → master
``` ```
- `pre-dev`: desarrollo activo - `pre-dev`: desarrollo activo — aquí entran todos los cambios
- `dev`: validación previa a producción - `dev`: validación previa a producción
- `master`: producción estable - `master`: producción estable
- Merges siempre con `--no-ff` - Merges siempre con `--no-ff`
- **NUNCA** propagar en sentido inverso (master → dev o dev → pre-dev)
- Secuencia correcta:
```bash
git checkout pre-dev && git merge <mi-cambio> --no-ff
git checkout dev && git merge pre-dev --no-ff && git push origin dev
git checkout master && git merge dev --no-ff && git push origin master
```
## Estructura de app Django ## Estructura de app Django