From: Rogan Dawes <lists@dawes.za.net>
Date: Mon, 29 Jun 2009 21:30:47 GMT
Subject: Re: Merge, rebase and whitespace fixes
Message-ID: <4A493287.20106@dawes.za.net>
In-Reply-To: <cb7bb73a0906291218m3ba43109s35cad87efc5161a7@mail.gmail.com>

Giuseppe Bilotta wrote:
> Hello all,
> 
> recently a tree I've been working on received some thorough whitespace
> adjustments (changing indents from spaces to tabs). This results in
> annoying conflicts when running merges or rebases with my local
> branches. I tried googling around but I couldn't find any helpful
> hints on how to make git cope with this. Any suggestions?
> 

Do the same thing to your own tree?