Re: Re: PHP-8.1 branch seems broken
| From: | Derick Rethans | Date: | Mon, 04 Jul 2022 10:07:52 +0000 |
| Subject: | Re: Re: PHP-8.1 branch seems broken | ||
| References: | 1 2 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-118177@lists.php.net to get a copy of this message | ||
On Mon, 4 Jul 2022, Christoph M. Becker wrote:
> On 04.07.2022 at 10:16, Remi Collet wrote:
>
> > In PHP 8.1:
> >
> > This branch is 1 commit ahead, 7 commits behind master.
> >
> >
> > This seems terribly wrong, looks like was merged from master
> > (NEWS file have 8.2 entries)
> >
> >
> > Can some GIT expert check and fix that ?
>
> Derick is working on fixing the issue. Since he will need to reset to
> the last good state, and force-push, everybody will have to fix their
> clones afterwards (reset and pull). Please do not push to any branch
> until this is done.
Thanks to Tim we've rebuild the PHP-8.1 branch. You will only have to
reset the PHP-8.1 branch, with the following:
git fetch
git checkout PHP-8.1
# Backup local changes
git reset --hard origin/PHP-8.1
# Reapply local changes
Before you push anything, please make sure that the graph looks good,
preferably by using the "gitk" tool to visualise.
cheers,
Derick