I searched the forum for conflicts and found that there should be a setting "- Scope of merge conflicts" somewhere. But I can't find it.
The thing is VStudio tells me a file has 0 conflicts, Cirrus says 2.
The lines "conflicting" are within a 3 line-scope.
Where do I change the scope for treating these as conflicts or not?
Thanks.
The thing is VStudio tells me a file has 0 conflicts, Cirrus says 2.
The lines "conflicting" are within a 3 line-scope.
Where do I change the scope for treating these as conflicts or not?
Thanks.
Comment