search

dotnet / roslyn

The Roslyn .NET compiler provides C# and Visual Basic languages with rich code analysis APIs.
https://docs.microsoft.com/dotnet/csharp/roslyn-sdk/
MIT License
19.13k stars 4.04k forks source link

Support diff3 conflict style for conflict marker detection and fixes #42224

Open JoeRobich opened 4 years ago

JoeRobich commented 4 years ago

I use VS Code as my mergetool and have become a fan of the diff3 conflict style (https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git), since it allows me to resolve issues with more confidence. 

<<<<<<< HEAD
THIS IS USEFUL
||||||| merged common ancestors
This is useful
=======
This is really useful
>>>>>>> c2392943.....

As pointed out in this comment (https://github.com/dotnet/roslyn/pull/42213#issuecomment-595965510) we do not currently handle these ||||||| markers.

CyrusNajmabadi commented 3 weeks ago

We would take a targeted community pr here.