From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Should we restore manually maintained ChangeLogs Date: Wed, 9 Mar 2016 10:34:46 -0800 Organization: UCLA Computer Science Department Message-ID: <56E06CC6.5000604@cs.ucla.edu> References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> <83vb50wxhv.fsf@gnu.org> <87y49vz4cg.fsf@acer.localhost.com> <87vb4zb0i4.fsf@gnu.org> <837fheuu6a.fsf@gnu.org> <83twkiteb3.fsf@gnu.org> <83lh5utbxb.fsf@gnu.org> <56DDD02A.20809@cs.ucla.edu> <83fuw2t2ue.fsf@gnu.org> <56DE0F6A.6010207@cs.ucla.edu> <83pov5rmt6.fsf@gnu.org> <56DFD78F.40205@cs.ucla.edu> <83fuvzprh5.fsf@gnu.org> <56E0687D.1000904@cs.ucla.edu> <83r3fjo6a9.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1457548524 22620 80.91.229.3 (9 Mar 2016 18:35:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Mar 2016 18:35:24 +0000 (UTC) Cc: mthl@gnu.org, johnw@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 09 19:35:10 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 1adiwv-0005vO-1d for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 19:35:09 +0100 Original-Received: from localhost ([::1]:43426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adiwu-0005eB-Ed for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 13:35:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adiwf-0005dz-57 for emacs-devel@gnu.org; Wed, 09 Mar 2016 13:34:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adiwe-0000jM-BB for emacs-devel@gnu.org; Wed, 09 Mar 2016 13:34:53 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:45143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adiwZ-0000iV-JI; Wed, 09 Mar 2016 13:34:47 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id D84CC160F6E; Wed, 9 Mar 2016 10:34:46 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id jk2qHhjFOpWw; Wed, 9 Mar 2016 10:34:46 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 3D31A160F6D; Wed, 9 Mar 2016 10:34:46 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id cFe6fPPBejvg; Wed, 9 Mar 2016 10:34:46 -0800 (PST) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 24CB8160F6C; Wed, 9 Mar 2016 10:34:46 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: <83r3fjo6a9.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 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:201276 Archived-At: On 03/09/2016 10:27 AM, Eli Zaretskii wrote: > If you don't do merges, you won't ever see merge conflicts. I saw conflicts all the time when rebasing or applying patches. Perhaps these weren't "merge conflicts" in some technical sense, but they were just as much a hassle.