From 710d4c078523ff1b96e74ee7960007391a2f7b4f Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 29 Nov 2024 17:11:50 +0400
Subject: [PATCH] ajout de merge2php82.sh

---
 merge2php82.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 merge2php82.sh

diff --git a/merge2php82.sh b/merge2php82.sh
new file mode 100755
index 0000000..c22566d
--- /dev/null
+++ b/merge2php82.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+mydir="$(cd "$(dirname -- "$0")"; pwd)"
+myself="$mydir/$(basename -- "$0")"
+cwd="$(pwd)"
+if [ "$mydir" == "$cwd" -o "${mydir#$cwd/}" != "$mydir" ]; then
+    cp "$myself" /tmp/merge2php82.sh
+    exec /tmp/merge2php82.sh "$mydir" "$mydir"
+else
+    nulibdir="${2:-$mydir}"
+    source "$nulibdir/load.sh" || exit 1
+fi
+
+args=(
+    "description"
+    #"usage"
+)
+parse_args "$@"; set -- "${args[@]}"
+
+projdir="${1:-.}"
+cd "$projdir" || die
+
+edebug "mydir=$mydir, nulibdir=$nulibdir, projdir=$projdir"
+
+git checkout php82
+git rebase master ||
+    die "Le rebase automatique a échoué. Après avoir résolu les conflits, faire
+    git checkout master
+    pp -af
+"
+git checkout master
+pp -af