From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Trouble merging line-numbers branch into master Date: Fri, 7 Jul 2017 21:23:54 +0000 Message-ID: <20170707212353.GA2428@acm> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1499462799 17676 195.159.176.226 (7 Jul 2017 21:26:39 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Jul 2017 21:26:39 +0000 (UTC) User-Agent: Mutt/1.7.2 (2016-11-26) Cc: Emacs developers To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 07 23:26:33 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTali-0004AX-Nn for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 23:26:30 +0200 Original-Received: from localhost ([::1]:58859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTaln-0006Fo-9W for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 17:26:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTakU-00059W-Uc for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:25:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTakR-0004x5-Qk for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:25:14 -0400 Original-Received: from ocolin.muc.de ([193.149.48.4]:31391 helo=mail.muc.de) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1dTakR-0004w2-J9 for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:25:11 -0400 Original-Received: (qmail 34988 invoked by uid 3782); 7 Jul 2017 21:25:09 -0000 Original-Received: from acm.muc.de (p548C664D.dip0.t-ipconnect.de [84.140.102.77]) by colin.muc.de (tmda-ofmipd) with ESMTP; Fri, 07 Jul 2017 23:25:08 +0200 Original-Received: (qmail 2513 invoked by uid 1000); 7 Jul 2017 21:23:54 -0000 Content-Disposition: inline In-Reply-To: X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 193.149.48.4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:216291 Archived-At: Hello, Kaushal On Fri, Jul 07, 2017 at 15:43:24 +0000, Kaushal Modi wrote: > Hello, > I have having trouble merging the scratch/line-numbers branch into master. > I get one merge conflict in NEWS. That is fine; I resolved that locally. > But then further merging fails because of > 1 git … commit -- > lisp/progmodes/cc-fonts.el:1251: space before tab in indent. > + (c-major-mode-is 'c++-mode) > lisp/progmodes/cc-fonts.el:1252: space before tab in indent. > + (save-excursion (c-back-over-member-initializers))) > You can see that there is white-space trapped between tabs (whitespace > mode) on lines 1251 and 1252: I've just counted up occurrences of in our elisp files, and we've got around 2058 in 263 distinct files. A lot of these appear to have been where `comment-region' has inserted ";; " before tabs, but not all of them. Have you any idea what's special about those two s in cc-fonts.el that git complained about them, but not the other 2056 occurrences? > [image: image.png] > (Look! I am making use of the new line-numbers feature to visually > communicate with people remotely :) ) > So something is configured in git that blocks this merging is such mix of > white-space/tabs is seen? In any case, I removed those spaces, but still > cannot proceed with the merge. How can I move forward with the merge? > Also, shouldn't that commit have been blocked in the first place instead of > complaining about it when merging? I think there's something more subtle going on here. > -- > Kaushal Modi -- Alan Mackenzie (Nuremberg, Germany).