RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge
| From: | Anatol Belski | Date: | Fri, 14 Oct 2016 02:31:28 +0000 |
| Subject: | RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge | ||
| References: | 1 2 3 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-96365@lists.php.net to get a copy of this message | ||
Hi Yasuo,
> -----Original Message-----
> From: Yasuo Ohgaki [mailto:yohgaki@ohgaki.net]
> Sent: Friday, October 14, 2016 4:08 AM
> To: Anatol Belski <anatol.php@belski.net>
> Cc: Johannes Schlüter <johannes@php.net>; PHP internals list
> <internals@lists.php.net>; Davey Shafik <davey@php.net>
> Subject: Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge
>
> Hi Anatol,
>
> On Fri, Oct 14, 2016 at 8:11 AM, Anatol Belski <anatol.php@belski.net> wrote:
> > Yeah, we'll be checking to restore the missing 7.1 commits. Currently merges
> 7.0 to 7.1, or 7.1 to master, might have issues. I'd ask to please retain from
> pushing there, until the branch is restored. Hopefully this will happen at some
> point tomorrow.
>
> I already pushed UPGRADING. This should be harmless.
> I'll retain other changes, if any.
>
Many thanks for checking. It went faster than I thought, so it should be already possible to push an
do the merges. Though it'd not hurt to check everything is in order before. So I'd make
sense to wait like half a day or so for everyone to look over the branch before starting with some
"heavy" things :)
Thanks
Anatol