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
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -80,10 +80,17 @@ class MiVista(APIView):
|
||||
pre-dev → dev → master
|
||||
```
|
||||
|
||||
- `pre-dev`: desarrollo activo
|
||||
- `pre-dev`: desarrollo activo — aquí entran todos los cambios
|
||||
- `dev`: validación previa a producción
|
||||
- `master`: producción estable
|
||||
- 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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user