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: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Date: Mon, 17 Aug 2020 20:02:56 +0300 Message-ID: <83a6ytgq7z.fsf@gnu.org> References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> <83k0xxgt81.fsf@gnu.org> <0c69fb1c-330c-efcf-6005-95117bba9057@cs.ucla.edu> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40701"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, larsi@gnus.org, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 17 19:04:02 2020 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 1k7iYD-000ASF-I4 for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 19:04:01 +0200 Original-Received: from localhost ([::1]:38540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7iYC-00038P-Ky for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 13:04:00 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7iXR-0002BH-72 for emacs-devel@gnu.org; Mon, 17 Aug 2020 13:03:13 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:60795) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7iXQ-0002DV-5D; Mon, 17 Aug 2020 13:03:12 -0400 Original-Received: from [176.228.60.248] (port=3674 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k7iXP-0002e1-6d; Mon, 17 Aug 2020 13:03:11 -0400 In-Reply-To: <0c69fb1c-330c-efcf-6005-95117bba9057@cs.ucla.edu> (message from Paul Eggert on Mon, 17 Aug 2020 09:11:21 -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:253902 Archived-At: > Cc: larsi@gnus.org, emacs-devel@gnu.org > From: Paul Eggert > Date: Mon, 17 Aug 2020 09:11:21 -0700 > > I avoid the problem by never committing anything to my local copy of the master > branch unless I immediately push the result. Very occasionally someone else is > committing at the same time so my push fails; in that case I delete my master > branch, re-create it from upstream, and start over. So when I do "git pull" I > never need to rebase and I never need to merge. This is cleaner and simpler than > the alternatives, at least for me. Yes, avoiding the need for this is better, but we are only human... We decided long ago that doing an automatic merge during "pull" is okay, so these rare incidents are not serious enough to worry about.