Repo sync for protected CLA branch #6906
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add Note about new Trust Settings in VS2022 * update page ownership metadata * fix version moniker tag * minor text edit * remove unnecessary version monikers * revise the moniker versioning * fix build errors * fix moniker-end tags
Using the DTE2 fixes most issues with the DTE and _DTE. I added a small line mentioning that
* update new dialog for 2019 and NET 5.0 * Update dialog image for 2019 and NET 5.0 * Update container-tools.md * update filename for pattern * rename and set outline * set outline
* Remove file that is producing warnings * Remove toc
* switch title to sentence caps * add VS2022 relnotes to TOC
* Move support link in admin-responsibilities.md * Remove blank lines from admin-roles.md * Move support link in assign-license-bulk.md Co-authored-by: Evan Windom (Red Door Collaborative LLC) <[email protected]>
* Drafted ASP.NET Core with React * edits * fixed warnings * Drafted ASP.NET Core Angular app * updated art * minor edits * TOC edits * fixed blocking issues * fixed blocking issues * fixed blocking issues * toc fixes * Update docs/javascript/tutorial-asp-net-core-with-angular.md Co-authored-by: Genevieve Warren <[email protected]> * Update docs/javascript/tutorial-asp-net-core-with-react.md Co-authored-by: Genevieve Warren <[email protected]> Co-authored-by: Genevieve Warren <[email protected]>
* add new screenshot for VS2022 warning msg * update image link info
* F1 keyword edits * tweak * tweak * tweak
* add vs.find keyword to Find in Files per PM request * add VS2017 & VS2019 updates * add screenshots * delete duplicate vs.findreplace.findinfiles keyword. * add and revise screenshots * add more monikers to disambiguate versioned features * delete Warning note * rearrange some text to follow different UI between versions * fix Build error * add more VS2019-specific content * add info about checkboxes under Look In section * revise list of locations in the Look In section * revise exclude from search info * remove superfluous Look In info from VS2019 content * final formatting edits * fix moniker range to show VS2019 sections in VS2022
* F1 keyword edits * tweak * tweak * tweak * unit testing updates * freshness checks * freshness checks
* Broken link fixed. * Suggestion updated.
* F1 keyword edits * tweak * tweak * tweak * unit testing updates * freshness checks * freshness checks * Updated freshness
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)
|
@ghogen : Thanks for your contribution! The author(s) have been notified to review your proposed change. |
|
@ghogen @Mikejo5000 I don't know what a protected CLA branch is, but I see two PRs to sync it in this repository. The PRs are 6 and 5 days old. Shall I merge them? This PR and #6909. . |
|
@ktoliver Hmm, these should be merged, but we should not use squash merge for it. I think these used to be merged automatically by the repo sync process, but probably when I changed the branch settings to enforce squash merge, these could no longer merge successfully. I will have to decide whether to change the branch settings again to allow it, or merge these manually. I think for now, I'll change the branch settings and we will discuss it and decide. |
This was referenced Aug 4, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The pull request is created from master637631102313231424 to master to fix git push error for protected CLA branch