-
Couldn't load subscription status.
- Fork 6.1k
36). Add topic files 111 to 114 #18580
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.
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
36). Add topic files 111 to 114 #18580
Conversation
|
@jameshkramer can you resolve the merge conflicts here? I believe a lot of them were caused by this PR: #18724 |
|
GitHub does not allow me to resolve conflicts on this (button is grayed out). |
|
@jameshkramer Please follow these instructions to resolve the conflicts via GitBash command line: https://review.docs.microsoft.com/en-us/help/contribute/resolve-merge-conflicts?branch=master#scenario-1---your-pull-request-has-a-merge-conflict Thanks. |
|
Thanks @tfosmark! @jameshkramer let me know if you need help! |
|
Well, I had to resolved a bunch of conflicts on the linq-to-xml now because of that PR. For the changes that were related to that PR, I just ignored since we already simplified paths in the changes here. |
59de5eb to
e8e7e63
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This LGTM @jameshkramer
I'll
now.
This PR is for user story #1576037.
It adds four article files, makes corresponding deletions from the C# and VB folders, and adds redirection entries.
Please merge #18259, #18299, #18325, #18413, #18439, and #18541 before merging this.
cc: @BillWagner @mairaw @tfosmark @marteeleigh
Contributes to #4728