Re: Re: Question about merged PR #937
| From: | Christoph M. Becker | Date: | Sun, 22 Sep 2019 12:02:59 +0000 |
| Subject: | Re: Re: Question about merged PR #937 | ||
| References: | 1 2 3 4 5 6 7 8 9 10 11 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-107285@lists.php.net to get a copy of this message | ||
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~<number of commits to squash>
> 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 commits?
In this case I likely would not squash commits of different authors. An
alternative would be to append the following to the commit message:
Co-authored-by: name <name@example.com>
--
Christoph M. Becker