Support diff3 conflict style for conflict marker detection and fixes · dotnet/roslyn

(1 Kommentar) (0 Reaktionen) (0 zugewiesene Personen)C# (4.257 Forks)batch import

Area-CompilersFeature Requesthelp wanted

Repository-Metriken

Stars: (20.414 Sterne)
PR-Merge-Metriken: (Durchschn. Merge 6T 17h) (256 gemergte PRs in 30 T)

Beschreibung

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.

Contributor Guide

Research-Richtung: Untersuchen Sie, wie Roslyn derzeit Konfliktmarkierungen im Quellcode behandelt, und erweitern Sie die Analyse, um die `|||||||` Markierung für den diff3 Stil zu erkennen.
Tech Stack: csharp
Domain: developer experience
Issue Type: Funktion
Schwierigkeit: 3
Geschätzte Zeit: Halber Tag
Aktivitätsstatus: Aktiv
Klarheit: Klar
Voraussetzungen: GitC#
Einsteigerfreundlichkeit: 55