Automation: main-next integrate #18298
Merged
Conversation
This file contains 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
…m fluid-internal to fluidframework (#18239) Makes fluid app insights logger not private and changes the scope from fluid-internal to fluidframework
|
Actively working on it |
Josmithr
approved these changes
Nov 15, 2023
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.
main-next integrate PR
DO NOT MERGE THIS PR USING THE GITHUB UI.
The aim of this pull request is to sync main and next branch. This branch has MERGE CONFLICTS with next due to this commit. If this PR is assigned to you, you need to do the following:
git fetch --all-- this ensures your remote refs are updatedgit remote -v-- displays the list of remote repositories associated with your Git repository along with their corresponding URLs. You have to choose the remote associated with the microsoft/FluidFramework repository. Change the remote name in these example commands if yours is not upstream.git checkout -b next-merge-head upstream/next-- make a temporary branch at next.git merge upstream/main-next-902c55a-- merge next into main-next-902c55agit add .-- stage all the local changesgit commit -m "Automation: main-next integrate"-- commit the mergegit checkout main-next-902c55a-- check out the mergeBranch locallygit merge next-merge-head --ff-only-- fast-forward to the merge commitgit push upstream-- and push it to upstream (your upstream remote name may be different)git commit --amend -m "Automation: main-next integrate"git push --force-with-leaseOnce CI passes and the PR is ready to merge, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.