From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen 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 18:26:30 +0200 Message-ID: <87lfidp7bd.fsf@gnus.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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1816"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Eli Zaretskii , Robert Pluim , 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 18:29:07 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 1k7i0Q-0000Jl-TQ for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 18:29:06 +0200 Original-Received: from localhost ([::1]:52202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7i0P-0004BH-UX for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 12:29:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7hyB-0000oo-I3 for emacs-devel@gnu.org; Mon, 17 Aug 2020 12:26:47 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:40298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7hy9-00062v-Ut; Mon, 17 Aug 2020 12:26:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1vcIpwVbbIdXbWmrkum6EiJk4B5f7Q3TwizFV/OIIMY=; b=Ug+P4MOhMQ3/DndQWTrmlxyYLg pfJs1vDsCOeW0iqKoOkO+LLLQ4PHb6R0snq6/aBb60yIuGiNRc8JOMLElsW+INV2gX3cWFqosTtks mKmBuneusveMpvw4xZ8mKloOcMUkBDKwQdMlBSdpyj0YclnRnW5jc3ISyxPmPzEd5++U=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k7hxw-0004On-7w; Mon, 17 Aug 2020 18:26:39 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEX08PW7nLiih4Wx aF7///+ybgpJAAAAAWJLR0QEj2jZUQAAAAd0SU1FB+QIERAXDf7A01QAAAGUSURBVDjLnVNresMw CHN6AkMuMOAEgfvfbRJO1q6PHxtfk7aWkQTYY3yOTfCafLYx+WwnIB2bPMYzMOb56wnY5iswO6OB H6qOuS3VOe7iZ/r2Ij7f2HoQfwOcZd65f1d/Zcw5/hvu6ndRdbvkq6L8jIiqTDc1KQBeyVXsbsAA eAPchFBxrBdXuYdAcD3F9gbEDQ8BLIKIXLE2mZg7gASgho9GlofR2cpoqhBvgIIKEdpNJReYYvHC Lqm4gwkiSbeATqAcXwFXkUnrrAPOkKFmlCmW2rUaPQ4qmFAfi3AbXkYzzBAnsLNrxepheInrDuPV gYyjCdGrDFKyaob7AX9hBCgB/WaiR5njhsqzOU2V+UVFjP1WRSB1euwAYgFse8+j5ECjlqMFyAJg RAEk96T32dMeFIxo9wndZUdEMIHRjRNZdtFaqSPrAgIpqzy4xaRKoqlK2T7MxQncxUG8XyenunDY zc7AWI+92m9PjCNrAO6DZpUAuNDK8yT2jAKa7EsPpv56B26PV+q8Uf03vj5k7J8v3De3Z242s706 mQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0wOC0xN1QxNjoyMzoxMiswMDowMKrmZZ8AAAAldEVY dGRhdGU6bW9kaWZ5ADIwMjAtMDgtMTdUMTY6MjM6MTIrMDA6MDDbu90jAAAAAElFTkSuQmCC X-Now-Playing: Mike Westbrook's _Love and Understanding_: "Love and Understanding" In-Reply-To: <0c69fb1c-330c-efcf-6005-95117bba9057@cs.ucla.edu> (Paul Eggert's message of "Mon, 17 Aug 2020 09:11:21 -0700") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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:253895 Archived-At: Paul Eggert writes: > Yes, "pull --rebase" causes more trouble than it cures. > > I avoid the problem by never committing anything to my local copy of > the master branch unless I immediately push the result. I always do a pull --rebase. Or, that is, I have this in my ~/.gitconfig: [pull] rebase = true Which I didn't have in my OpenBSD vm, which caused the confusion. > 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. I don't really see any problems with the commit/pull --rebase/push flow? Nobody else even knows that I've done it, which is how it should be. The number of times I've needed to do a merge with that flow is... I can count them on two fingers, I think. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no