From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: Dealing with merge noise (was: Merging release branch) Date: Sun, 31 Oct 2021 11:19:43 -0700 Message-ID: References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.fsf@gnu.org> <874k8yspb4.fsf@gnus.org> <835ytepvad.fsf@gnu.org> <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> <83lf2ao4jz.fsf@gnu.org> <04203f394658f284d78b@heytings.org> <83ee81oe2n.fsf@gnu.org> <9b18f0c1-0dc0-9c88-a6e1-df3aa5d4a94b@yandex.ru> <87zgqpntfm.fsf@gnus.org> <83wnltmdn3.fsf@gnu.org> <87h7cxns3u.fsf@gnus.org> <87pmrlp4gu.fsf_-_@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3688"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , emacs-devel@gnu.org To: =?UTF-8?Q?K=C3=A9vin_Le_Gouguec?= , Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 19:20:59 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mhFRz-0000q2-Ap for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 19:20:59 +0100 Original-Received: from localhost ([::1]:55902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhFRx-0003no-QP for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 14:20:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhFQq-0002Kn-NQ for emacs-devel@gnu.org; Sun, 31 Oct 2021 14:19:48 -0400 Original-Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:33346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhFQo-0005jM-Ti; Sun, 31 Oct 2021 14:19:48 -0400 Original-Received: by mail-pf1-x431.google.com with SMTP id h74so312840pfe.0; Sun, 31 Oct 2021 11:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:in-reply-to:references:mime-version:date:message-id:subject:to :cc:content-transfer-encoding; bh=CnZz45rQTLfLtDuUGLpdIIVyJevOlcORKYGU5nIywJo=; b=aAIafnAR/0RFyVIFLW8HA32+Zz2GvNwflkF/e/MziM47+MccUMz5Pla8JX+BTNVAdR Fjjd7T+O1CFPEgDf3HSPkWpd0vcu9BEWw/eGR/5sY2Q8ePzZ0TrnDHe0QgqYf/Eatpfm S542DeqC5NQFqLnv+2k11N/y8bezJfZ6gP517ZSu6/M/tlCXv9Z3XXFZjexSIIZVn7Wz Z2Auxn4/eIkoYuTZMzinSqZLKUGXPBWfCDUxifNRSlP54jHDXXXjzLw8ht4/mkoVMOLU 1xRJ0wLu8+qeFFpEYNx+ZWdjgBODssMP/8bdrq4Qs5+vkBibvhjSUwoYtC8lwDte13dA z10g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to:cc:content-transfer-encoding; bh=CnZz45rQTLfLtDuUGLpdIIVyJevOlcORKYGU5nIywJo=; b=EqONO/Y039kxlUTUgqMKnRtuTiGXBfzlSN2sp/RsPCejgzMOYGBCHnfbiVz4bITVYJ AQNsmEm/+zH9YF1egwBcqL3HTbLh98N9w7/HApl0qaE91cLQ7fdRx3ejgNGKHIgXkgSz wYGiCJvnjU5qNTpl4r0ST59UhY1PGo9pT7Qj9Y64oVexoI06KytqTVI4DYLHd3R2QuSK iqgg5z/Jm0jaq1iTL9Ad0MWsirZ9KQfcv+9UEFvoh9mMZM/R7uhBn22DKht8zbEmO173 s+7qmMEX/tT6HyYmt/LHkmPESmDQb3bbUjZi9n/ppjiL1HjBdsczZHhslbWvarbb14fd EvJQ== X-Gm-Message-State: AOAM533nbiGz7i2a3XCzHiiiVkiPV1SfV3O8gjq/qXUpGW3maAsKj7Qd Tf5iQnktm6RJqgO2bulMRwfAvWkMwrStNSUC/h4= X-Google-Smtp-Source: ABdhPJyRUlAdPooOZEEBdG21kUgsARHiQs53poPu6tSiqoy2diCQdcX5GqsgrLvTSrKVLv2lalLPuguNtHvt3VilTgw= X-Received: by 2002:a63:370c:: with SMTP id e12mr18057800pga.359.1635704384315; Sun, 31 Oct 2021 11:19:44 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 31 Oct 2021 11:19:43 -0700 In-Reply-To: <87pmrlp4gu.fsf_-_@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=stefankangas@gmail.com; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:278320 Archived-At: K=C3=A9vin Le Gouguec writes: > (Not sure if this was suggested in past discussions, but maybe sticking > "--no-merges" in vc-git-log-switches can reduce the pain somewhat?) You still want to know when emacs-28 was merged into master though. The better solution is for everyone to just use "rebase" when they want to push their own local work to master, and "merge" when merging from emacs-28 or a feature branch.