[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Trouble merging line-numbers branch into master

From: Paul Eggert
Subject: Re: Trouble merging line-numbers branch into master
Date: Fri, 7 Jul 2017 14:41:36 -0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1

Presumably the lines in question were changed in one branch or the other (not necessarily by messing with white space), and our git settings are suggesting that you omit the spaces before tabs while you're futzing with those lines.

As build-aux/git-hooks/pre-commit suggests, you can work around the problem temporarily with the shell command 'git config core.whitespace -trailing-space'. I don't recommend this setting in general, though.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]