dotnet/roslyn

Support diff3 conflict style for conflict marker detection and fixes

Open

#42,224 opened on Mar 6, 2020

View on GitHub
 (1 comment) (0 reactions) (0 assignees)C# (4,257 forks)batch import
Area-CompilersFeature Requesthelp wanted

Repository metrics

Stars
 (20,414 stars)
PR merge metrics
 (Avg merge 6d 17h) (256 merged PRs in 30d)

Description

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 direction
Investigate how Roslyn currently handles conflict markers in source code and extend parsing to recognize the `|||||||` marker for diff3 style.
Tech stack
csharp
Domain
developer experience
Issue type
Feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
Half day
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
GitC#
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
55