Ignore whitespace around curly braces
It would be nice to have an option to ignore whether the curly braces around statements are placed on the same line or a new line, to ease merging after the VS editor automatically applied the preferred style of different developers.
if (foo) {
bar();
}
vs
if (foo)
{
bar();
}
or even
if (foo) { bar(); }
27
votes
![](https://secure.gravatar.com/avatar/963236040924e6f202b7bbbea2ca5444?size=40&default=https%3A%2F%2Fassets.uvcdn.com%2Fpkg%2Fadmin%2Ficons%2Fuser_70-6bcf9e08938533adb9bac95c3e487cb2a6d4a32f890ca6fdc82e3072e0ea0368.png)
New SemanticMerge able to skip format conflicts.
Check it out!
http://blog.semanticmerge.com/2014/05/skip-format-conflicts-with-new.html
-
miryamgsm commented
A new release (1.0.64) has been publish with support for this! Check it out!