Travis and "rebase before commit"

[Sterling P. Smith]

Rainer, Mojca,

Sorry for the noise.  I had misremembered which option was disabled.

-Sterling

----- Original Message -----
> From: "Rainer Müller" <raimue at macports.org>
> To: "Sterling Smith" <smithsp at fusion.gat.com>, "Mojca Miklavec" <mojca at macports.org>
> Cc: "MacPorts Development" <macports-dev at lists.macports.org>
> Sent: Thursday, June 22, 2017 7:07:25 AM
> Subject: Re: Travis and "rebase before commit"

> It is enabled and the default. The thing is that in the Mojca's workflow
> for editing the PR commits, you would still need to push to the PR
> branch, wait for Travis to finish and approve the change, then merge.
> Otherwise GitHub does not recognize the PR as merged.
> 
> In my opinion, this behavior can be considered the correct way, as this
> ensures the additional changes you made to the PR are tested once again.
> 
> However, as noted before, you can also add a "Closes: #xxx" to the
> commit message to make GitHub recognize a merged PR. That also removes
> the need to push to the PR branch, you can just publish to master directly.
> 
> To make it clearer, I rewrote the instructions on the wiki and added
> these two options:
> 
> https://trac.macports.org/wiki/WorkingWithGit#a3.Publishchanges
> 
> Rainer