docs: norme merge squash (feature→develop→master).

Met à jour la décision §26, le briefing front et l’API Gitea.
Les merges --no-ff déjà poussés (#167/#168) restent inchangés.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-09-24 00:55:55 +02:00
co-authored by Cursor
parent f9fd8d73a8
commit 7d491d5072
3 changed files with 46 additions and 14 deletions
+8 -1
View File
@@ -116,10 +116,17 @@ curl -s -H "Authorization: token $GITEA_TOKEN" \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls?state=open" | jq .
# Créer une PR (head = branche source, base = branche cible)
# Norme : feature/* → develop, puis develop → master
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/json" \
-d '{"head":"develop","base":"master","title":"Titre de la PR"}' \
-d '{"head":"feature/XX-nom","base":"develop","title":"feat(#XX): Titre","body":"Closes #XX"}' \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
# Merger en squash (norme — voir 24_DECISIONS-PROJET.md §26)
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/json" \
-d '{"Do":"squash","MergeTitleField":"feat(#XX): Titre","MergeMessageField":"Closes #XX"}' \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls/{index}/merge"
```
### 3.4 Branches