Re: Trouble merging line-numbers branch into master

[Alan Mackenzie <acm@muc.de>]

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 <space><tab> 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 <space><tab>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).