Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/5.0.2xx to master #4494

Merged
merged 3 commits into from
Dec 3, 2020
Merged

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from release/5.0.2xx into master.

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/release/5.0.2xx-to-master
git reset --hard upstream/master
git merge upstream/release/5.0.2xx
# Fix merge conflicts
git commit
git push upstream merges/release/5.0.2xx-to-master --force

…ment

Change the API argument for `InterproceduralAnalysisConfiguration.Create` to avoid null syntax tree being passed into it.

Fixes #4491. I will create a separate PR to port the fix to 2.9.x branch
Harden InterproceduralAnalysisConfiguration to prevent null tree argu…
@codecov
Copy link

codecov bot commented Dec 3, 2020

Codecov Report

Merging #4494 (5530a8b) into master (9df0075) will decrease coverage by 0.00%.
The diff coverage is 61.40%.

@@            Coverage Diff             @@
##           master    #4494      +/-   ##
==========================================
- Coverage   95.84%   95.84%   -0.01%     
==========================================
  Files        1175     1175              
  Lines      268047   268061      +14     
  Branches    16174    16177       +3     
==========================================
+ Hits       256921   256929       +8     
+ Misses       9068     9058      -10     
- Partials     2058     2074      +16     

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

Successfully merging this pull request may close these issues.

2 participants