Can git be made to mostly auto-merge XML order-insensitive files? : <p>When merging Lightswitch branches, often colleagues will add properties to an entity I also modified, which will result in a merge conflict, as the new XML entries are added to the same positions in the lsml file.</p>

<p>I can effectively always solve these by accepting left and right in no particular order, so one goes above the other, as order isn't important in these particular instances. On the rare instances this isn't valid, this would produce an error in the project anyway, which I accept as a risk (but haven't encountered).</p>

<p>Is there a way (preferably for the file extension) to get git to automatically accept source and target changes for the same position and simply place one beneath the other?</p>
