unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Trouble merging line-numbers branch into master
@ 2017-07-07 15:43 Kaushal Modi
  2017-07-07 15:51 ` Noam Postavsky
  2017-07-07 21:23 ` Alan Mackenzie
  0 siblings, 2 replies; 10+ messages in thread
From: Kaushal Modi @ 2017-07-07 15:43 UTC (permalink / raw)
  To: Emacs developers


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

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-07-08 12:46 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-07 15:43 Trouble merging line-numbers branch into master Kaushal Modi
2017-07-07 15:51 ` Noam Postavsky
2017-07-07 18:08   ` Kaushal Modi
2017-07-07 21:23 ` Alan Mackenzie
2017-07-07 21:38   ` Stefan Monnier
2017-07-07 21:41   ` Paul Eggert
2017-07-07 21:46     ` Kaushal Modi
2017-07-08  8:04       ` Eli Zaretskii
2017-07-08 12:05         ` Noam Postavsky
2017-07-08 12:46           ` Kaushal Modi

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).