Trouble merging line-numbers branch into master

[Kaushal Modi <kaushal.modi@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1038 bytes --]

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:

[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?
-- 

Kaushal Modi

[-- Attachment #1.2: Type: text/html, Size: 1677 bytes --]

[-- Attachment #2: image.png --]
[-- Type: image/png, Size: 35535 bytes --]