From: "Julien \"_FrnchFrgg_\" Rivaud" <frnchfrgg@free.fr>
To: gcc@gcc.gnu.org
Subject: Re: gcc-cvs mails for personal/vendor branches for merge commits
Date: Sun, 19 Jan 2020 22:40:00 -0000 [thread overview]
Message-ID: <qvvvcs$1ftb$1@ciao.gmane.io> (raw)
In-Reply-To: <20200118174945.GT3191@gate.crashing.org>
Le 18/01/2020 à 18:49, Segher Boessenkool a écrit :
> 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.
There is the git push --force-with-lease option to avoid that. Its goal
is to force a non-fast-forward push, but only if the remote position
(HEAD) is actually where you expect it to, that is no work you don't
know about has been pushed in the mean time.
I strongly recommend to use --force-with-lease on non-user branches.
User branches you usually control totally and are the only one to push
to, so that's less an issue.
>
> One easy way to avoid this is to just have only one person pushing to a
> certain branch.
>
>
> Segher
>
next prev parent reply other threads:[~2020-01-18 22:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 15:07 Jakub Jelinek
2020-01-15 15:42 ` Joseph Myers
2020-01-15 15:51 ` Jakub Jelinek
2020-01-15 16:01 ` Joseph Myers
2020-01-15 16:42 ` Jason Merrill
2020-01-15 16:58 ` Joseph Myers
2020-01-15 17:09 ` Jason Merrill
2020-01-15 17:57 ` Iain Sandoe
2020-01-15 20:20 ` Jason Merrill
2020-01-19 14:10 ` Segher Boessenkool
2020-01-19 22:40 ` Julien "_FrnchFrgg_" Rivaud [this message]
2020-01-20 18:42 ` Segher Boessenkool
2020-01-15 19:21 ` Richard Earnshaw (lists)
2020-01-16 9:55 ` Joseph Myers
2020-01-16 14:28 ` Joel Brobecker
2020-01-16 14:35 ` Jakub Jelinek
2020-01-16 14:43 ` Richard Earnshaw (lists)
2020-01-16 18:51 ` Jakub Jelinek
2020-01-16 22:03 ` Joseph Myers
2020-01-16 18:58 ` Joseph Myers
2020-01-17 16:47 ` Joel Brobecker
2020-01-17 17:22 ` Iain Sandoe
2020-01-17 17:59 ` Joel Brobecker
2020-01-17 19:15 ` Jason Merrill
2020-01-17 22:39 ` Joel Brobecker
2020-01-18 9:50 ` Iain Sandoe
2020-01-18 11:07 ` Jason Merrill
2020-01-18 14:30 ` Joseph Myers
2020-01-17 17:23 ` Joseph Myers
2020-01-17 21:14 ` Joel Brobecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='qvvvcs$1ftb$1@ciao.gmane.io' \
--to=frnchfrgg@free.fr \
--cc=gcc@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).