Moving to GitHub: Status Update, Action Required

[Davide Liessi]

2016-10-25 15:35 GMT+02:00 Ryan Schmidt <ryandesign at macports.org>:
>
>> On Oct 25, 2016, at 6:54 AM, Rainer Müller <raimue at macports.org> wrote:
>>
>> On 2016-10-25 10:36, Ryan Schmidt wrote:
>>>
>>>
>>> On Oct 24, 2016, at 17:57, Clemens Lang <cal at macports.org> wrote:
>>>
>>>>> On Tue, Oct 25, 2016 at 12:17:57AM +0200, Marko Käning wrote:
>>>>> A description of how exactly one would rebase (potentially squash and
>>>>> history-rewrite) a submitted PR onto current master should be on our
>>>>> WorkingWithGit wiki page.
>>>>
>>>> the easiest approach is just clicking the button that does this on
>>>> GitHub. Of course there's also a way to do it from the command line.
>>>
>>> We should document, with screenshots, the specific buttons that should be clicked to achieve this, for the benefit of those developers like me who are not that familiar with git and GitHub.
>>
>> Keeping such a documentation with screenshots updated to the current
>> GitHub release seems excessive. The GitHub documentation already has
>> screenshots. We should not try to recreate it, but rather place the
>> links to the relevant sections.
>>
>> https://help.github.com/articles/merging-a-pull-request/
>
> As long as we don't just link, but in cases where their documentation offers multiple choices, tell the user which of those choices to use.

I have just noticed in one of my GitHub repositories that in Settings
-> Options there is a "Merge button" section that lets you
enable/disable the behaviours of the merge button described in the
above link.
Maybe you could leave only "Allow rebase merging" enabled and disable the rest.

Best wishes.
Davide