Conversation
|
Hello @dotnet-bot! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉 p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
|
@jasonmalinowski @AlekseyTs I'm still noticing some intermittent determinism failures in Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.dll after #49402 was merged in: https://dev.azure.com/dnceng/public/_build/results?buildId=890631&view=logs&j=057c83a9-93f9-5bce-4899-deb8d06fc190&t=483a0497-9f4d-53d7-5af2-784b067f0ccc&s=d654deb9-056d-50a2-1717-90c08683d50a |
We identified another product issue, which is addressed in #49467. Also, apparently there is an issue with the determinism test itself, @jaredpar is looking at that. |
This is an automatically generated pull request from master into master-vs-deps.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout merges/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-master-vs-deps --force