Hi all,
Whenever a feature branch in the Architect Server lives for a while, it tends to end up with a merge conflict in the same two files: Program.cs and Strings.resx. The conflicts are almost always mechanical, in the sense that both sides simply added something, but they come back with every branch.
The cause is that both files have a single place where new things get appended: the service registration block in Program.cs, and the end of the resource list in Strings.resx. Every feature, whatever area it belongs to, writes to that same spot, so two branches nearly always collide there. Git merges additions in different parts of a file without trouble; what it cannot merge is two different additions at the same line.
Strings.resx is the more unpleasant of the two, because the repeated XML lines make git align the context badly, and the conflict often ends up cutting through the middle of an element.
The idea would be to split those two hotspots by feature area, so that a branch touching wizards and a branch touching the model tree no longer write to the same lines. The principle is one place to append per area, rather than one for the whole server.
Would this be worth doing, or is the current layout deliberate?
Thanks!