[PHP-DEV] Re: Question about merged PR #937

On 19.09.2019 at 17:01, guilhermebla...@gmail.com wrote: > One of my old PRs to PHP that was claimed to be merged disappeared > from master. However, the upgrade note is still there in master and > 7.4beta1. > > Here is the PR: https://github.com/php/php-src/pull/937 > Here is the commit referencin

[PHP-DEV] Re: Question about merged PR #937

Thanks for the clarification Christoph! Somehow I couldn't see it when looking for the commit hash. Sorry for the disturbance in the list here. PS: I find it funny that even though I'm the original author of the code, I don't show as a contributor in any statistics. It'd be a shame to not be consi

[PHP-DEV] Re: Question about merged PR #937

On 19.09.2019 at 19:20, guilhermebla...@gmail.com wrote: > Thanks for the clarification Christoph! > Somehow I couldn't see it when looking for the commit hash. Sorry for > the disturbance in the list here. > > PS: I find it funny that even though I'm the original author of the > code, I don't sho

Re: [PHP-DEV] Re: Question about merged PR #937

Hi Guilherme, That is what is happening when squashing commits during merge. I noticed this also few months ago but didn't mentioned it as I though this is one of the usual flows. I quickly searched it now and found it here: https://wiki.php.net/vcs/gitworkflow: "Additionally, the history of pull

Re: [PHP-DEV] Re: Question about merged PR #937

On Fri, Sep 20, 2019 at 12:50 AM Alexandru Pătrănescu wrote: > Hi Guilherme, > > That is what is happening when squashing commits during merge. > > I noticed this also few months ago but didn't mentioned it as I though this > is one of the usual flows. > I quickly searched it now and found it her

Re: [PHP-DEV] Re: Question about merged PR #937

Hi Nikita, Yes, you are right that the author (and not the committer) is the one taken in considerations for git blame and contributor display. Committer is just technical and related to who created/recreated a commit. But, unfortunately, you are wrong in believing that the author is preserved du

Re: [PHP-DEV] Re: Question about merged PR #937

I was quick to write an answer and forgot to search for a more detailed explanation online, being busy with some other work tasks. Github explains it here: https://help.github.com/en/articles/about-merge-methods-on-github Before enabling squashing commits, consider these disadvantages: > >- Yo

Re: [PHP-DEV] Re: Question about merged PR #937

On 20.09.2019 at 11:22, Alexandru Pătrănescu wrote: > I was quick to write an answer and forgot to search for a more detailed > explanation online, being busy with some other work tasks. > Github explains it here: > https://help.github.com/en/articles/about-merge-methods-on-github > > Before enabl

Re: [PHP-DEV] Re: Question about merged PR #937

Hi Christoph, Was this squash done during merging of a github pull request? On Fri, Sep 20, 2019 at 1:06 PM Christoph M. Becker wrote: > On 20.09.2019 at 11:22, Alexandru Pătrănescu wrote: > > > I was quick to write an answer and forgot to search for a more detailed > > explanation online, being

Re: [PHP-DEV] Re: Question about merged PR #937

On 20.09.2019 at 12:35, Alexandru Pătrănescu wrote: > Was this squash done during merging of a github pull request? Yes, it was when applying . I didn't use the Github UI, though. -- Christoph M. Becker -- PHP Internals - PHP Runtime Development Mailin

Re: [PHP-DEV] Re: Question about merged PR #937

Can you let us know what you used as it's doing the job well :) CLI git merge or another UI; which one? I'm also curious what will happen if there would be two authors on the same branch/pull request. Is it interactive or pre-configured to use author of the first commit, last commit, most of the c

Re: [PHP-DEV] Re: Question about merged PR #937

On 20.09.2019 at 12:59, Alexandru Pătrănescu wrote: > Can you let us know what you used as it's doing the job well :) > CLI git merge or another UI; which one? I'm usually using TortoiseGit, but basically I'm doing git rebase -i HEAD~ > I'm also curious what will happen if there would be tw

Re: [PHP-DEV] Re: Question about merged PR #937

Hi Christoph, The method you described looks great. Squashing with rebase interactive works fine, with choosing what commits to keep and what commits to squash into the kept ones. This can be done by merger or author. Merging a pull request with squashing in github will set the author's commit to

Re: [PHP-DEV] Re: Question about merged PR #937

On 27.09.2019 at 11:25, Alexandru Pătrănescu wrote: > The method you described looks great. > Squashing with rebase interactive works fine, with choosing what commits to > keep and what commits to squash into the kept ones. > This can be done by merger or author. > > Merging a pull request with sq