-
Notifications
You must be signed in to change notification settings - Fork 154
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
Sync yarp
branch with main
#960
Conversation
|
16249b9
to
850de03
Compare
@@ -85,6 +85,26 @@ def test_bar; end | |||
assert_empty(response) | |||
end | |||
|
|||
def test_no_code_lens_for_unsaved_files | |||
skip |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: Had to mark as skip
for now, as with other tests in this class.
5cfc48d
to
08bd793
Compare
08bd793
to
572274a
Compare
Did you use merge to bring the changes in from main? I see changes that are related to other commits (e.g.: bumping the version) present in this commit. Our default is to always use rebase. Will the fact that the changes from other commits are merged here in this different commit create more conflicts when rebasing this branch? |
This brings in the latest changes from main. There were few conflicts in DocumentSymbol due to #947 and #949, so I thought it best to have a review of how that was resolved.