From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-return-201686-listarch-gcc=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 48265 invoked by alias); 18 Jan 2020 17:49:57 -0000
Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc/>
List-Post: <mailto:gcc@gcc.gnu.org>
List-Help: <http://gcc.gnu.org/ml/>
Sender: gcc-owner@gcc.gnu.org
Received: (qmail 48257 invoked by uid 89); 18 Jan 2020 17:49:56 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_20,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=sk:non-fas, sk:nonfas, H*f:sk:014947f, guessing
X-HELO: gate.crashing.org
Received: from gate.crashing.org (HELO gate.crashing.org) (63.228.1.57) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 18 Jan 2020 17:49:55 +0000
Received: from gate.crashing.org (localhost.localdomain [127.0.0.1])	by gate.crashing.org (8.14.1/8.14.1) with ESMTP id 00IHnlA3013211;	Sat, 18 Jan 2020 11:49:47 -0600
Received: (from segher@localhost)	by gate.crashing.org (8.14.1/8.14.1/Submit) id 00IHnjJo013210;	Sat, 18 Jan 2020 11:49:45 -0600
Date: Sun, 19 Jan 2020 14:10:00 -0000
From: Segher Boessenkool <segher@kernel.crashing.org>
To: Iain Sandoe <idsandoe@googlemail.com>
Cc: Joseph Myers <joseph@codesourcery.com>, Jason Merrill <jason@redhat.com>,        Jakub Jelinek <jakub@redhat.com>,        "Richard Earnshaw (lists)" <Richard.Earnshaw@arm.com>, gcc@gcc.gnu.org,        Joel Brobecker <brobecker@adacore.com>
Subject: Re: gcc-cvs mails for personal/vendor branches for merge commits
Message-ID: <20200118174945.GT3191@gate.crashing.org>
References: <20200115141617.GS10088@tucnak> <alpine.DEB.2.21.2001151448060.11538@digraph.polyomino.org.uk> <014947f3-43a8-e54d-8798-5d5f104e1fbd@redhat.com> <alpine.DEB.2.21.2001151628340.1765@digraph.polyomino.org.uk> <89C87961-B21A-4E54-914F-40A89B5D5BBD@googlemail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <89C87961-B21A-4E54-914F-40A89B5D5BBD@googlemail.com>
User-Agent: Mutt/1.4.2.3i
X-IsSubscribed: yes
X-SW-Source: 2020-01/txt/msg00356.txt.bz2

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
certain branch.


Segher