diff --git a/_merge2php82 b/_merge2php82 index 15e2486..f50dc57 100755 --- a/_merge2php82 +++ b/_merge2php82 @@ -16,10 +16,10 @@ else fi 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 88176ad..c4d3655 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "extra": { "branch-alias": { - "dev-master": "7.4.x-dev", + "dev-php74": "7.4.x-dev", "dev-php82": "8.2.x-dev" } },