From: Florian Weimer <fw@deneb.enyo.de>
To: Carlos O'Donell <carlos@redhat.com>
Cc: "Gabriel F. T. Gomes" <gabriel@inconstante.net.br>,
libc-alpha <libc-alpha@sourceware.org>,
Sergio Durigan Junior <sergiodj@redhat.com>
Subject: Re: Setup non-pushing gerrit instance for glibc.
Date: Tue, 12 Nov 2019 20:59:30 +0100 [thread overview]
Message-ID: <877e44g925.fsf@mid.deneb.enyo.de> (raw)
In-Reply-To: <1f1bbb12-4121-7243-35f7-dd082fc1c4fd@redhat.com> (Carlos O'Donell's message of "Tue, 12 Nov 2019 14:21:34 -0500")
* Carlos O'Donell:
> For example Gerrit already tells me if patches have merge conflicts, so
> I can ignore those or tell people to rebase.
Gerrit's notion of a rebases and conflicts is a bit unclear to me. I
think it doesn't run the real Git behind the scenes, so it can't know
what kind of conflicts can be resolved by automated merging. For my
patches, I have seen both valid and spurious conflict indicators. In
one case, I could hit Rebase in the web UI and it would automatically
rebase the patch, but it wasn't clear to me why it was needed in that
particular case.
I don't know if any of the other web-based tools handle this better.
next prev parent reply other threads:[~2019-11-12 19:59 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 19:39 Setup non-pushing gerrit instance for glibc Carlos O'Donell
2019-10-24 21:41 ` Joseph Myers
2019-10-25 0:43 ` Ian Kent
2019-10-25 1:16 ` Jonathan Nieder
2019-10-25 10:21 ` Ian Kent
2019-10-25 1:02 ` Carlos O'Donell
2019-10-25 2:04 ` Sergio Durigan Junior
2019-10-25 3:14 ` Simon Marchi
2019-10-25 4:10 ` Simon Marchi
2019-10-25 14:48 ` Joseph Myers
2019-10-25 15:48 ` Simon Marchi
2019-10-25 16:10 ` Joseph Myers
2019-10-25 16:28 ` Simon Marchi
2019-10-25 1:25 ` Jonathan Nieder
2019-10-25 14:09 ` Florian Weimer
2019-10-25 15:18 ` Joseph Myers
2019-10-25 17:00 ` Sergio Durigan Junior
2019-10-25 20:33 ` Joseph Myers
2019-10-25 21:06 ` Sergio Durigan Junior
2019-10-25 21:13 ` Joseph Myers
2019-10-27 22:12 ` Sergio Durigan Junior
2019-10-28 17:58 ` Joseph Myers
2019-10-28 19:17 ` Jonathan Nieder
2019-10-28 22:59 ` Joseph Myers
2019-10-29 1:21 ` Sergio Durigan Junior
2019-10-25 22:03 ` Jonathan Nieder
2019-10-26 13:53 ` Carlos O'Donell
2019-10-30 18:25 ` Szabolcs Nagy
2019-11-12 18:53 ` Gabriel F. T. Gomes
2019-11-12 19:21 ` Carlos O'Donell
2019-11-12 19:59 ` Florian Weimer [this message]
2019-11-12 20:02 ` Jonathan Nieder
2019-11-12 21:10 ` Gabriel F. T. Gomes
2019-11-12 21:13 ` Carlos O'Donell
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877e44g925.fsf@mid.deneb.enyo.de \
--to=fw@deneb.enyo.de \
--cc=carlos@redhat.com \
--cc=gabriel@inconstante.net.br \
--cc=libc-alpha@sourceware.org \
--cc=sergiodj@redhat.com \
/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).