u/MikasaTanikawa

I have branch 'test' with file test.cs:

using System;
if (true) {
    call(argument);
}

Also I have branch 'test-2' with file test.cs:

using System;

if (true) {
    if (something)
        call(argument);
    else
        return;
}

When I merging 'test' into 'test-2' and trying resolve conflict, visual studio breaks single conflict to three smaller, but does not include call(argument); line (or just leading whitespaces) into any conflict block as seen in middle tab on screenshot. As result changes before call(argument); become lost.

Is there any way to change such behavior?

Paranid Odysseus wanted to slowly destroy pirate defence platform from afar. But I didn't build it for SCA for nothing. Blockade of that gate in Heretic's End is crucial for my plan to save endangered pre-sentients from extinction in Emperor's Pride. So I pushed this ship under plasma rain.