On 9/17/07, J. Mayer <[EMAIL PROTECTED]> wrote:
> > 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.
> Don't know what's wrong in your expression but it did not what you think
> it should (and you did not even check....).
>
> DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
>

if we were using git (but you can do it locally anyway), you would not
have these conflicts problems...

git-apply indead has this feature about ignoring useless whitespaces...

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !


Reply via email to