[core-workflow] Questions about the proposed workflows

[Barry Warsaw]

On Dec 01, 2015, at 08:47 PM, Barry Warsaw wrote:

>However I think removing the intermediate commits require an interactive
>rebase to squash commits on the source branch.  GitLab doesn't provide a
>through-the-web interface to interactive rebases.  You'd have to use the
>command line for this, and I often do that when I want to make local cleanups
>to the source branch.

Oops, I'm wrong about that.  `git merge` allows for --squash and a quick
search found some reference to this for GitLab, but I don't know whether this
happens automatically or not when the merge is accepted.  I don't see an
option to squash or not squash though, so I'd have to ask.

Cheers,
-Barry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://mail.python.org/pipermail/core-workflow/attachments/20151201/8844f185/attachment.sig>