Merge pre-dev: docs flujo ramas

sync
Merge: docs flujo ramas
2026-04-17 01:15:19 +02:00 · 2026-04-17 01:15:05 +02:00 · 2026-04-17 01:15:05 +02:00 · 2026-04-17 01:15:04 +02:00 · 2026-04-17 01:13:56 +02:00 · 2026-04-17 01:06:34 +02:00
1 changed files with 8 additions and 1 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -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
Author	SHA1	Message	Date
juanjo	c4db3639c3	Merge pre-dev: docs flujo ramas All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:15:19 +02:00
juanjo	c692ce2a61	sync All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:15:05 +02:00
juanjo	152e9c14ef	Merge: docs flujo ramas	2026-04-17 01:15:05 +02:00
juanjo	99de5f06b5	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 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 01:15:04 +02:00
juanjo	379ce825f6	Merge pre-dev: fix api_hub_dispatcher → api_config All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:13:56 +02:00
juanjo	abe67a7f20	Merge pre-dev: fix env_file docker-compose All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:06:34 +02:00
juanjo	5367ba7313	Merge pre-dev: fix env_file path docker-compose All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:05:40 +02:00
juanjo	23cd4bf8b4	Merge pre-dev: gunicorn + wait-for-db + healthcheck Some checks failed DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit Details	2026-04-17 00:39:30 +02:00
juanjo	b43ca9d919	Merge branch 'dev' of https://git.v-encore-lab.com/Proyecto-SaaS/django-core-base into dev	2026-04-17 00:39:30 +02:00
juanjo	adaf20bd8e	Merge pre-dev: revert api_config	2026-04-16 23:31:29 +02:00
juanjo	95e036108d	Merge pre-dev: renombrar api_config → api_hub_dispatcher	2026-04-16 23:28:44 +02:00