From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Amin Bandali Newsgroups: gmane.emacs.devel Subject: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Date: Tue, 18 Aug 2020 23:56:32 -0400 Organization: GNU Message-ID: <87zh6rjnkf.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> <87lfidp7bd.fsf@gnus.org> <837dtxgpyz.fsf@gnu.org> <877dtxp2sx.fsf@gnus.org> <83364lgmth.fsf@gnu.org> <87364lp0zt.fsf@gnus.org> <99458299-197f-87e5-620c-9745d637d327@harpegolden.net> <87blj7ixq6.fsf@tcd.ie> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26673"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Aug 19 05:57:12 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 1k8FDs-0006pL-FU for ged-emacs-devel@m.gmane-mx.org; Wed, 19 Aug 2020 05:57:12 +0200 Original-Received: from localhost ([::1]:34186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8FDr-0005lV-Hi for ged-emacs-devel@m.gmane-mx.org; Tue, 18 Aug 2020 23:57:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8FDG-0005Lz-70 for emacs-devel@gnu.org; Tue, 18 Aug 2020 23:56:34 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:39433) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8FDF-00015I-UW for emacs-devel@gnu.org; Tue, 18 Aug 2020 23:56:33 -0400 Original-Received: from [2607:fea8:3fdf:f688::8] (port=57452 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k8FDF-0007ya-Gb for emacs-devel@gnu.org; Tue, 18 Aug 2020 23:56:33 -0400 Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: <87blj7ixq6.fsf@tcd.ie> 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:253984 Archived-At: --=-=-= Content-Type: text/plain Basil L. Contovounesios writes: [...] > > Am I the only one who prefers doing separate 'git fetch' and 'git > merge/rebase' operations, and never uses 'git pull'? :) > > This way I get to see exactly what's changed upstream, whether it > conflicts with my local changes, decide whether I want/need to > merge/rebase, etc. etc. Not much substance to add, but same here. I generally try to start at the tip of the branch (i.e. its latest commit) I plan to commit to, in order to avoid the need for rebasing or merging whenever possible. Once I'm done writing, I fetch and review upstream changes if any, carefully rebase my own commit(s) on top of them, and push. It's worked out very well for my (admittedly mostly small-scoped) changes to various git repositories thus far. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCAAuFiEEObM8jZRIDS3cwqSYi0Sgzce5VvIFAl88ovAQHGJhbmRhbGlA Z251Lm9yZwAKCRCLRKDNx7lW8m3SEACNUn6O1OcZjs8bVrd1N1I2oKn4YKawVgj4 R9yMxutzNTQdwbwSJoUKK+XXubKJ5Th8xxOa9NOtf/nBXSX9qvJjs3ygb/p+t18J drMHBOnrg8aSR78+/xRSJyo+P8Cd7TUno+oK6avylhW+goUjNWooNwdIKSYFgJ4Z PwdJAhvJs1xviMiU0WqxXjQT82Gn7FNeJ61ueqHgxaaY45UJieOAx/ZR2TkcO31U ySBhBxLwPazt+o/QS+RcI4JLxfySm7M3YR2Qjv9n57m5JmtA11+rrH94xno6fLVS QambCKLU9Jol19ujSEwUDjU2Lpg+CKCulYla41134fZr0trCebS/fWknFCrmg60F W2A1N+/UKNNiez5jdcKxdeqNiz0gWaJ/AeBecKS29mFYiEJvikhYfu1xB/gXghHZ DlQ1PvokJ23gQ9tm7HWI6bDQg1EzAO75czqoiaTliHIPKWJqhL75Y3Tpkmg4UAJZ zO6ktsQwqENicQbStvC6g2xifKUC9wG0PqHdeaEjIf1rwlXFNXO8RtftA6Nnrl09 x3HCzguRPZwkd14P9JghZxqwk8gh7WKy8bjegwBS/CHBENiCTYuyMONMbtPupLSp UAxPhOplP5GlHfOKHs+ZimCL0FyhomI+zCnw5XvCZ0bzd+v1G5jwkPkFO5aAi2Ui MKItp7rDYA== =NBog -----END PGP SIGNATURE----- --=-=-=--