So there is already a PR in the devguide advising contributors to keep
their commit history intact, see https://github.com/python/devguide/pull/162
Assuming people do read the devguide, then let's hope that we won't lose
the commit history going forward.
There is also already a section in the devg
On 4/11/2017 1:21 PM, Donald Stufft wrote:
On Apr 11, 2017, at 12:25 PM, Terry Reedy mailto:tjre...@udel.edu>> wrote:
I was under the impression that the green [commit] button would do the
squashing. Or at least that it could.
Yes it can, and IIRC for CPython we have it set so it _only_
> On Apr 11, 2017, at 12:25 PM, Terry Reedy wrote:
>
> On 4/10/2017 11:55 PM, Martin Panter wrote:
>> On 11 April 2017 at 13:13, Mariatta Wijaya wrote:
>>> "View Changes" doesn't work when commits in PR were squashed, which seems to
>>> be the case in https://github.com/python/cpython/pull/851
On 4/10/2017 11:55 PM, Martin Panter wrote:
On 11 April 2017 at 13:13, Mariatta Wijaya wrote:
"View Changes" doesn't work when commits in PR were squashed, which seems to
be the case in https://github.com/python/cpython/pull/851
I wonder if there is a way to unsquash the commits? Will it help
On Tue, Apr 11, 2017 at 7:42 AM, Nick Coghlan wrote:
> Since we do the squash & merge to get an atomic commit at the end, it
> doesn't make sense to do any force pushes along the way.
>
I was going to argue with this, but then I realized you're right. We
shouldn't need rebase any more, merge sho
On 12 April 2017 at 00:21, R. David Murray wrote:
> On Mon, 10 Apr 2017 21:53:44 -0700, Guido van Rossum wrote:
>> - When the contributor makes multiple local commits without pushing to the
>> PR, I recommend using --amend unless they have several commits that
>> actually are logically distinct a
On Mon, 10 Apr 2017 21:53:44 -0700, Guido van Rossum wrote:
> - When the contributor makes multiple local commits without pushing to the
> PR, I recommend using --amend unless they have several commits that
> actually are logically distinct and relevant to the reviewer. (--amend is
> especially im