Re: Merge conflicts in .gitattributes can cause trouble

Johannes Schindelin [off-list ref] writes:

I would vote for:

4. We keep letting Git read in the *current* version of .gitattributes
   *before* the merge, and apply those attributes while performing the
   merge.

Even though this needs a major surgery to the way the attr subsystem
reads from these files, I think it is conceptually the cleanest.