Skip to content

Conversation

@jameshkramer
Copy link
Contributor

@jameshkramer jameshkramer commented May 22, 2020

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

@mairaw
Copy link
Contributor

mairaw commented Jun 10, 2020

@jameshkramer can you resolve the merge conflicts here? I believe a lot of them were caused by this PR: #18724

@jameshkramer
Copy link
Contributor Author

GitHub does not allow me to resolve conflicts on this (button is grayed out).

@tfosmark
Copy link

@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.

@mairaw
Copy link
Contributor

mairaw commented Jun 10, 2020

Thanks @tfosmark! @jameshkramer let me know if you need help!

@jameshkramer
Copy link
Contributor Author

@mairaw

Thanks, Maira. Did you find some information somewhere about the what the conflicts are, or did you just guess about #18724? Should I just merge locally with the current linq-to-xml, and push the results?

@mairaw
Copy link
Contributor

mairaw commented Jun 10, 2020

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.

@jameshkramer jameshkramer force-pushed the br36-add-topic-files-111-to-114 branch from 59de5eb to e8e7e63 Compare June 10, 2020 16:26
Copy link
Member

@BillWagner BillWagner left a 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 :shipit: now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants