[MacPorts] WorkingWithGit modified

[Sterling Smith]

Clemens,

On Sep 23, 2016, at 12:14PM, Clemens Lang <cal at macports.org> wrote:

> Hi,
> 
> On Fri, Sep 23, 2016 at 11:56:19AM -0700, Sterling Smith wrote:
>> Being a co-maintainer of a software project hosted on GitHub, where
>> the main developer does not use branches leads to inconsistencies in
>> how his contributions are handled vs other developers.
> 
> What would those inconsistencies be?

The main inconsistency in how his contributions are handled is that other developers have their code reviewed during the pull request, whereas he is pushing directly to the equivalent of MacPorts/master.  You are right that I was conflating fork/master with MacPorts/master.  Sorry.

> What is the difference between the master branch in a fork and an
> arbitrarily named branch based off master in a fork? Can't both be
> rebased against upstream/master in exactly the same way?
> 
>> There should also be a decision on the recommended way to get updates
>> from the latest master, whether that is by merging or rebasing.  I
>> personally like rebasing, but there is a stigma associated with it.
>> Note the possibility of a safer forced push after a rebase with
>> --force-with-lease.  (I didn't look to see if there was already a
>> recommendation.)
> 
> See https://trac.macports.org/wiki/WorkingWithGit#updating. The text
> currently recommends a rebase.

Thanks.

> 
> What's the stigma? The need to force push to your fork?

Since MacPorts is already recommending rebasing, apparently there is no stigma.

> -- 
> Clemens

-Sterling