From fd27e2ee3709aaa1af114c698b625317631fce97 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 24 Jan 2025 16:20:05 +0400
Subject: [PATCH] maj du nom de la branche

---
 _merge2php82  | 6 +++---
 composer.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_merge2php82 b/_merge2php82
index c22566d..d9c2dae 100755
--- a/_merge2php82
+++ b/_merge2php82
@@ -23,10 +23,10 @@ cd "$projdir" || die
 edebug "mydir=$mydir, nulibdir=$nulibdir, projdir=$projdir"
 
 git checkout php82
-git rebase master ||
+git rebase php74 ||
     die "Le rebase automatique a échoué. Après avoir résolu les conflits, faire
-    git checkout master
+    git checkout php74
     pp -af
 "
-git checkout master
+git checkout php74
 pp -af
diff --git a/composer.json b/composer.json
index e8367af..63666dd 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
 	],
 	"extra": {
 		"branch-alias": {
-			"dev-master": "7.4.x-dev",
+			"dev-php74": "7.4.x-dev",
 			"dev-php82": "8.2.x-dev"
 		}
 	},