Moving to GitHub: Status Update, Action Required

[Mojca Miklavec]

On 24 October 2016 at 20:08, Lawrence Velázquez wrote:
>> On Oct 24, 2016, at 1:58 PM, Clemens Lang wrote:
>>> On Mon, Oct 24, 2016 at 07:47:18PM +0200, Mojca Miklavec wrote:
>>>
>>> (My preference would be to keep linear history for master and not to
>>> keep ten broken revisions of a Portfile resulting from stepwise
>>> improvements in a pull request, but it would be nice to do some
>>> testing first.)
>>
>> Yes, that's also my preference. So we can agree on:
>> - rebase when merging PRs
>> - rewrite history on PR branches until it looks good
>
> +1 to both (so +2, I guess?). We want to avoid merge commits, and we
> want the history that is ultimately added to master to be clean and
> understandable. The precise method of achieving this (squash merging,
> interactive rebasing, etc.) is not really important.

Even if the method of achieving this is not prescribed***, I wouldn't
mind a bit of testing before screwing up the real repository.

*** But having some cheatsheet would help.

Mojca