From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 18:01:31 +0300 Message-ID: <838u0urb1w.fsf@gnu.org> References: <20160403111708.GA3537@acm.fritz.box> <87lh4uex9h.fsf@acer.localhost.com> <20160403121458.GC3537@acm.fritz.box> <87bn5qeuxo.fsf@acer.localhost.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1459695740 13413 80.91.229.3 (3 Apr 2016 15:02:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 15:02:20 +0000 (UTC) Cc: acm@muc.de, kaushal.modi@gmail.com, emacs-devel@gnu.org To: Ingo Lohmar Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 17:02:19 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1amjXe-0002gh-8q for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 17:02:18 +0200 Original-Received: from localhost ([::1]:53799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjXd-0007Sr-Kw for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 11:02:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjXQ-0007Sk-5J for emacs-devel@gnu.org; Sun, 03 Apr 2016 11:02:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amjXP-0002c1-FC for emacs-devel@gnu.org; Sun, 03 Apr 2016 11:02:04 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjXL-0002bp-P8; Sun, 03 Apr 2016 11:01:59 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3083 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1amjXL-0004uf-2V; Sun, 03 Apr 2016 11:01:59 -0400 In-reply-to: <87bn5qeuxo.fsf@acer.localhost.com> (message from Ingo Lohmar on Sun, 03 Apr 2016 14:30:27 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202629 Archived-At: > From: Ingo Lohmar > Date: Sun, 03 Apr 2016 14:30:27 +0200 > Cc: Emacs developers , > Kaushal Modi > > Single caveat: Do NOT start a merge when you have uncommited changes. > If you want, do 'git stash' first to recover them later. I disagree with this caveat. There's no reason to frighten people like that, as doing such merges will work most of the time. > In this case, you have to learn about rebase, as in 'git rebase > origin/master'. "git rebase" is a bad idea when merging a long-lived feature branch, so please don't advise this to users who are evidently not Git experts.