sda-php
/
nulib
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maj du nom de la branche

This commit is contained in:
Jephté Clain 2025-01-24 16:20:05 +04:00
parent 5353fdbec5
commit fd27e2ee37
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_merge2php82
View File

@ -23,10 +23,10 @@ cd "$projdir" || die
edebug "mydir=$mydir, nulibdir=$nulibdir, projdir=$projdir" edebug "mydir=$mydir, nulibdir=$nulibdir, projdir=$projdir"
git checkout php82 git checkout php82
git rebase master || git rebase php74 ||
die "Le rebase automatique a échoué. Après avoir résolu les conflits, faire die "Le rebase automatique a échoué. Après avoir résolu les conflits, faire
git checkout master git checkout php74
pp -af pp -af
" "
git checkout master git checkout php74
pp -af pp -af

2
composer.json
View File

@ -10,7 +10,7 @@
], ],
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "7.4.x-dev", "dev-php74": "7.4.x-dev",
"dev-php82": "8.2.x-dev" "dev-php82": "8.2.x-dev"
} }
}, },