SA1135 violation was since the StyleCop adding to the solution by df86052a31235d4dd740020dc8ddf574b3b1b81a, the rule violation was not fixed till #1663 because most of C# files had using block inside of namespace declarations.
The situation with conflicts became worst after merging #1663 where StyleCop violations of SA1135 rule (of Readability Rules) were fixed.
Expected Behavior
All
usingstatements are:namespacedeclarationMerge conflicts should go away in PRs. At least rebasing feature branches will be easier.
Actual Behavior / Motivation
There are multiple merge conflicts in old PRs which block code review and PR management.
Steps to Reproduce the Problem
SA1135 violation was since the StyleCop adding to the solution by df86052a31235d4dd740020dc8ddf574b3b1b81a, the rule violation was not fixed till #1663 because most of C# files had
usingblock inside ofnamespacedeclarations. The situation with conflicts became worst after merging #1663 where StyleCop violations of SA1135 rule (of Readability Rules) were fixed.Specifications