From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 2F1FF1F4B5 for ; Tue, 12 Nov 2019 19:59:42 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; q=dns; s=default; b=UXjn0 e4TOa+SvBHOqCwpQWidP/ExxQhlkiFvRPce7XjH9EzXjVCYFpFj+SCPFwJLiP/Yw gJP0pJn508uppuBf0DfyL96JZ4r69o4rZvjWQiBlookgYdtz2Lba7c3UJzg0/eu5 o/vPPzUsQTXI9JzRZAVUFw9SZx+GdNIhQll1nE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=default; bh=mpuSQVZN7vZ oYcaMVxxZLgC8D88=; b=PHXh0Jec4BhpX3LkihL8dOd9o6HGAlKvUUlZ4Xe8XrT mG9S016e/e1F5l3DiVH6oY/mhIsamUoNGC6a3giY4qOCv6WzD/YfqDZFeeGTtKeH 1I1z08zo9by2P4SSN9btxIIK8cLJQP8GD6VrHm1XIG7lvKue9tJbmIMfO2YOHyOM = Received: (qmail 97151 invoked by alias); 12 Nov 2019 19:59:39 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 97143 invoked by uid 89); 12 Nov 2019 19:59:39 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: albireo.enyo.de From: Florian Weimer To: Carlos O'Donell Cc: "Gabriel F. T. Gomes" , libc-alpha , Sergio Durigan Junior Subject: Re: Setup non-pushing gerrit instance for glibc. References: <2e93ece9-386b-c587-9355-33a4695a3f02@redhat.com> <20191112155303.2215a667@tereshkova.br.ibm.com> <1f1bbb12-4121-7243-35f7-dd082fc1c4fd@redhat.com> Date: Tue, 12 Nov 2019 20:59:30 +0100 In-Reply-To: <1f1bbb12-4121-7243-35f7-dd082fc1c4fd@redhat.com> (Carlos O'Donell's message of "Tue, 12 Nov 2019 14:21:34 -0500") Message-ID: <877e44g925.fsf@mid.deneb.enyo.de> MIME-Version: 1.0 Content-Type: text/plain * 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.