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: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, Date: Mon, 06 Apr 2015 15:24:44 +0300 Message-ID: <83zj6ljvg3.fsf@gnu.org> References: <20150405124321.362.95112@vcs.savannah.gnu.org> <552130FE.1010101@yandex.ru> <83mw2mn2no.fsf@gnu.org> <5521359D.2000509@yandex.ru> <83fv8emvgq.fsf@gnu.org> <55219139.8040507@yandex.ru> <83oan2l4pk.fsf@gnu.org> <5521B811.8070603@yandex.ru> <83d23hlmia.fsf@gnu.org> <5522760B.7020605@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428323114 21296 80.91.229.3 (6 Apr 2015 12:25:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 12:25:14 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 14:25:06 2015 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 1Yf65M-0005nP-CG for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 14:25:00 +0200 Original-Received: from localhost ([::1]:39891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf65L-0004uW-Mq for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 08:24:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf658-0004uL-AW for emacs-devel@gnu.org; Mon, 06 Apr 2015 08:24:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf654-0006Zl-95 for emacs-devel@gnu.org; Mon, 06 Apr 2015 08:24:46 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:48202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf654-0006ZZ-1A; Mon, 06 Apr 2015 08:24:42 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NMD00600WX3DL00@mtaout25.012.net.il>; Mon, 06 Apr 2015 15:20:00 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMD00M19WXCF480@mtaout25.012.net.il>; Mon, 06 Apr 2015 15:20:00 +0300 (IDT) In-reply-to: <5522760B.7020605@yandex.ru> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:185026 Archived-At: > Date: Mon, 06 Apr 2015 15:03:23 +0300 > From: Dmitry Gutov > CC: rms@gnu.org, emacs-devel@gnu.org > > On 04/06/2015 10:54 AM, Eli Zaretskii wrote: > > > Then please tell what you had in mind, perhaps it would be good to > > have that added. > > I use 'git rebase -i' for that. Not sure if we actually want to mention > rebasing in the instructions. That's exactly the issue: should we mention such techniques on that page? > But if not, should they recommend reviewing each commit right away after > it's made? Probably a good idea, thanks. > So what was needed is a pull, a merge resolving the conflicts, and then > a push. The situation was complicated by the need to resolve ChangeLog > conflicts manually (or else there may have been no conflicts at all), > which is something that was a problem for me as well after Emacs's > transition to Git. While I know how to merge, it wasn't obvious how > exactly those kind of conflicts should be resolved, which ordering to > use, dates, etc. And it's annoying to have to do it each time manually. I hope the instructions in their current form explain all that well enough.