dotnet/roslyn
Support diff3 conflict style for conflict marker detection and fixes
オープン
#42,224 opened on 2020/03/06
Area-CompilersFeature Requesthelp wanted
Repository metrics
- Stars
- (20,414 個のスター)
- PR merge metrics
- (平均マージ 6d 17h) (30d で 256 merged PRs)
説明
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.