In message: <[EMAIL PROTECTED]>
            Johannes Schindelin <[EMAIL PROTECTED]> writes:
: Hi,
: 
: On Mon, 17 Sep 2007, J. Mayer wrote:
: 
: > On Sun, 2007-09-16 at 21:08 +0000, Thiemo Seufer wrote:
: > > CVSROOT:  /sources/qemu
: > > Module name:      qemu
: > > Changes by:       Thiemo Seufer <ths>     07/09/16 21:08:06
: > >
: > > [lots of changes]
: > >
: > > Log message:
: > >   find -type f | xargs sed -i 's/[\t ]$//g' # on most files
: > 
: > Many thanks for generating hundreds of conflicts with a useless commit.
: 
: It is a whitespace fix, designed to remove tabs and spaces from ends of 
: lines, where they have no business of being.
: 
: Yes, it is a style fix.  But a fix nevertheless.
: 
: And your conflicts are probably DUE TO AN INFERIOUR MERGE TOOL that _you_ 
: use.  Time to join the modern world?

In reality, it best to never commit trailing white space in the first
place.  It only causes pain and misery.  This being one flavor of
that.

Warner


Reply via email to