From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Dealing with merge noise (was: Merging release branch) Date: Sun, 31 Oct 2021 20:31:48 +0200 Message-ID: <83sfwhm4ff.fsf@gnu.org> 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: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="25606"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, emacs-devel@gnu.org, kevin.legouguec@gmail.com To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 19:34:15 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 1mhFep-0006QR-3L for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 19:34:15 +0100 Original-Received: from localhost ([::1]:32778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhFen-00082c-SI for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 14:34:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhFcl-0007IS-5G for emacs-devel@gnu.org; Sun, 31 Oct 2021 14:32:10 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:34058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhFci-0000O4-Lj; Sun, 31 Oct 2021 14:32:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=peGexYMbOFju2TNEdesqN7ffCVwtqDEnUwAtnvaOd64=; b=G68dZzoMF6n4SeQKUYlA 1Mr/oiTDQ40554p0wGre5+6vVEhJYrHg+Mfl+VJoFUH2WuJCCmwY/gEHsj5KmAH9gg35zf1sS2dJ1 0iJLS+ZWzALSoRNlHhhLj8twCwaaEY/0RS0kpXZoU5VavsT46+wfctuVVdgwzmbgXMwCcnA2rlWQT VygcQ/bNBpgtHT4M5xAzgvfgKj4K1ZOw+oNLKMkwWSEv69S7DImgrzXxIERm8ZxYblfC399OkiLVX UIyAb1rIwOiCprT1C/M7Bw4yhs80ewfmhb/mv1C1UITF3VVLOQkHRNFkmOJKM/tF1QsFig3WYkq+D ZtQ31omd/5OZgw==; Original-Received: from [87.69.77.57] (port=4583 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhFcc-0002Iy-04; Sun, 31 Oct 2021 14:32:00 -0400 In-Reply-To: (message from Stefan Kangas on Sun, 31 Oct 2021 11:19:43 -0700) 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:278322 Archived-At: > From: Stefan Kangas > Date: Sun, 31 Oct 2021 11:19:43 -0700 > Cc: Eli Zaretskii , emacs-devel@gnu.org > > Kévin 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. We have decided long ago that we won't impose any restrictions on the workflows people use, and allow both merges and rebases. Whether or not to rebase is a matter of personal preferences, many times associated with strong feelings, and there's no need for us to bring the disagreements about that into the project. Allowing both styles worked well for us since we switched to Git, so I see no reason to deviate from that now.