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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html