From 99de5f06b5f7d11a5843b3123fe3570351842463 Mon Sep 17 00:00:00 2001 From: juanjo <130799031+juanminguezsanz2023@users.noreply.github.com> Date: Fri, 17 Apr 2026 01:15:04 +0200 Subject: [PATCH 1/2] =?UTF-8?q?docs:=20corregir=20flujo=20de=20ramas=20en?= =?UTF-8?q?=20CLAUDE.md=20(pre-dev=20=E2=86=92=20dev=20=E2=86=92=20master)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 --- CLAUDE.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CLAUDE.md b/CLAUDE.md index a57cd00..3228278 100644 --- 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 --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 From c692ce2a619a4bf10d77e540b5c9b87868e2677f Mon Sep 17 00:00:00 2001 From: juanjo <130799031+juanminguezsanz2023@users.noreply.github.com> Date: Fri, 17 Apr 2026 01:15:05 +0200 Subject: [PATCH 2/2] sync