22). Add topic files 59 to 62 #17846
Conversation
jameshkramer
requested review from
BillWagner,
KathleenDollard and
a team
as code owners
mairaw
added
the
vendor-project
|
@jameshkramer This currently has merge conflicts. Do you want me to review now, or wait until those are resolved? |
|
I resolved the conflicts, but we will probably get more when the prior PR, #17772, is merged. We get these merge conflicts because I always add redirections to the redirections file from linq-to-xml, rather than to the one in my most recent PR. We get the conflicts when there is more than one unmerged PR. We could reduce conflicts if I always built the redirections file from the one in the prior PR, even if the PR has not yet been merged. What do you think? |
| ## See also | ||
|
|
||
| - <xref:System.Linq.Enumerable.Select%2A> | ||
| - [Projections and Transformations (LINQ to XML) (Visual Basic)](../../visual-basic/programming-guide/concepts/linq/projections-and-transformations-linq-to-xml.md) |
There was a problem hiding this comment.
I imagine this article would be moved to this folder too, right?
There was a problem hiding this comment.
It just becomes a parent node. You make a good point, though. That does happen in this part of the project, and I could deal with it now.
There was a problem hiding this comment.
Up to you. We can merge as-is and then once you redirect, you'd have to change these links.
Co-Authored-By: Maira Wenzel <mairaw@microsoft.com>
|
Some merge conflicts to resolve 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 #17732 and #17772 before merging this.
cc: @tfosmark @marteeleigh
Contributes to #4728