Skip to content

5). Add topic files 5 to 6 #16883

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
Merged
merged 5 commits into from
Feb 1, 2020
Merged

5). Add topic files 5 to 6 #16883

merged 5 commits into from
Feb 1, 2020

Conversation

jameshkramer
Copy link
Contributor

@jameshkramer jameshkramer commented Jan 29, 2020 •
edited by mairaw
Loading

@mairaw
This PR is for user story #1576037.

It adds merged topic files 5 and 6, removes the corresponding C# and VB files, and adds appropriate redirection file entries.

cc: @tfosmark, @BillWagner

Contributes to #4728

@dotnet-bot dotnet-bot added this to the January 2020 milestone Jan 29, 2020
@mairaw mairaw added the vendor-project Indicates the issue/pr is related to a vendor project. label Jan 30, 2020
@Rick-Anderson
Copy link
Contributor

@jameshkramer can you resolve the merge conflicts in your PR's? Thanks.

@jameshkramer
Copy link
Contributor Author

@Rick-Anderson
Rick, I would be happy to fix the conflicts if I knew how. The Conflicting files that are listed are files that this PR deletes. I intend for them to be deleted, and I don't see why that is regarded as a conflict that must be resolved.
I did look into this, and I don't think I can make any progress without assistance. There is a Resolve Conflicts button, but it is not active for me, perhaps because I don't have write access to the respository.
Thanks - Jim
cc: @mairaw

@mairaw
Copy link
Contributor

mairaw commented Jan 31, 2020

I'll help him @Rick-Anderson.

@mairaw mairaw force-pushed the br5-add-topic-files-5-to-6 branch from 47ee4ff to 4fd355f Compare February 1, 2020 05:25
@mairaw mairaw force-pushed the br5-add-topic-files-5-to-6 branch from 4fd355f to 0dcbd64 Compare February 1, 2020 05:31
@mairaw mairaw merged commit fa4a11d into dotnet:linq-to-xml Feb 1, 2020
@jameshkramer jameshkramer deleted the br5-add-topic-files-5-to-6 branch April 22, 2020 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BillWagner BillWagner Awaiting requested review from BillWagner

@gewarren gewarren Awaiting requested review from gewarren

@KathleenDollard KathleenDollard Awaiting requested review from KathleenDollard

@mairaw mairaw Awaiting requested review from mairaw

Assignees

@jameshkramer jameshkramer

Labels
vendor-project Indicates the issue/pr is related to a vendor project.
Projects
None yet
Milestone
January 2020
Development

Successfully merging this pull request may close these issues.
4 participants
@jameshkramer @Rick-Anderson @mairaw @dotnet-bot