This is the mail archive of the
mailing list for the GCC project.
Re: gcc-cvs mails for personal/vendor branches for merge commits
On Wed, Jan 15, 2020 at 04:37:49PM +0000, Iain Sandoe wrote:
> I’m guessing that public development branches will probably gravitate to the
> no non-FF mode, if they are to be used by people other than the primary author
> .. although that does somewhat limit things; rebasing WIP onto trunk and
> reorganising / squashing is useful as well.
If a branch does rebase all people who commit to it need to make sure
not to overwrite others' work. Your pushes are always non-fast-forward,
so you do not notice you did not incorporate someone else's new work if
you do not take care.
One easy way to avoid this is to just have only one person pushing to a