Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge

2016-10-14 Thread Christoph M. Becker
On 14.10.2016 at 04:25, Anatol Belski wrote: > I would explicitly ask Dmitry, Sara, Hui, Stas, Bob, Nikita and > Christoph to check that all the code pushed after Monday 2016-10-10 > 13:11:45 is where it's expected to be. But also everyone else > involved/interested - it would be a big help to dou

RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge

2016-10-13 Thread Anatol Belski
Hi Yasuo, > -Original Message- > From: Yasuo Ohgaki [mailto:yohg...@ohgaki.net] > Sent: Friday, October 14, 2016 4:08 AM > To: Anatol Belski > Cc: Johannes Schlüter ; PHP internals list > ; Davey Shafik > Subject: Re: [PHP-DEV] IMPORTANT: Git reset after wrong

RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge

2016-10-13 Thread Anatol Belski
> -Original Message- > From: Anatol Belski [mailto:anatol@belski.net] > Sent: Friday, October 14, 2016 1:11 AM > To: 'Johannes Schlüter' ; 'PHP internals list' > > Cc: 'Davey Shafik' > Subject: RE: [PHP-DEV] IMPORTANT: Git reset a

Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge

2016-10-13 Thread Yasuo Ohgaki
Hi Anatol, On Fri, Oct 14, 2016 at 8:11 AM, Anatol Belski 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 hap

RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge

2016-10-13 Thread Anatol Belski
> -Original Message- > From: Johannes Schlüter [mailto:johan...@php.net] > Sent: Friday, October 14, 2016 12:37 AM > To: PHP internals list > Cc: Davey Shafik ; Anatol Belski > Subject: [PHP-DEV] IMPORTANT: Git reset after wrong merge > > Hi, > > as Davey noted in the thread "Master m