Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use git conflict markers when we cannot merge text #76099

Merged
merged 13 commits into from
Nov 26, 2024
Merged

Use git conflict markers when we cannot merge text #76099

merged 13 commits into from
Nov 26, 2024

Conversation

CyrusNajmabadi
Copy link
Member

Fixes #74366

@CyrusNajmabadi CyrusNajmabadi requested a review from a team as a code owner November 26, 2024 15:39
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Nov 26, 2024
@CyrusNajmabadi CyrusNajmabadi requested a review from genlu November 26, 2024 15:39
@CyrusNajmabadi
Copy link
Member Author

@genlu ptal

@CyrusNajmabadi
Copy link
Member Author

@ToddGrun ptal

ToddGrun
ToddGrun reviewed Nov 26, 2024
View reviewed changes
...orkspaces/CSharp/Portable/LinkedFiles/CSharpLinkedFileMergeConflictCommentAdditionService.cs Outdated
afterString);
return $"""

/* {header}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/* {header}

Out of curiosity, why not use the git merge markers for the new/removed cases too?

ToddGrun
ToddGrun approved these changes Nov 26, 2024
View reviewed changes
Copy link
Contributor

@ToddGrun ToddGrun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@CyrusNajmabadi CyrusNajmabadi merged commit df51eea into dotnet:main Nov 26, 2024
25 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Nov 26, 2024
@CyrusNajmabadi CyrusNajmabadi deleted the conflictMarker branch November 26, 2024 22:15
@dotnet-bot dotnet-bot mentioned this pull request Nov 29, 2024
Closed
This was referenced Dec 11, 2024
Closed
Closed
@dibarbet dibarbet modified the milestones: Next, 17.13 P3 Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ToddGrun ToddGrun ToddGrun approved these changes

@genlu genlu Awaiting requested review from genlu

Assignees
No one assigned
Labels
Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead VSCode
Projects
None yet
Milestone
17.13 P3
Development

Successfully merging this pull request may close these issues.

"Unmerged changes" should use merge markers to mark refactoring conflicts across multiple targets
3 participants
@CyrusNajmabadi @ToddGrun @dibarbet