title: Avoiding merge conflicts in resx files
body: <p>In our C# MVC project we are storing our localizable strings in .resx files. Every time we add a new string, Visual Studio puts it at the bottom of the file, which means that if two strings are added in different branches then we will get a merge conflict, because two different blocks of code are being added to the same place.</p>
  
  <p>How can we reduce our merge conflicts? Sorting the strings alphabetically might help, but I can't see how to do this. Or maybe we could tell git to treat each <code>&lt;data&gt;...&lt;/data&gt;</code> tag as an independent block?</p>
  
  <p>We're currently using git, but had the same problem with TFS/TFVC.</p>