Pull master into 6.1.X #617
Closed
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
Update POM to next anticipated version: 6.2.0-SNAPSHOT
Cherry pick 6.1.0 to master
Add .vscode to gitignore
Add .vscode to .gitignore
test the ability of the MemoryRequestServer to correctly move a direct sketch onto the heap. But the implementations of the tests were not correct.
Fix website references.
These tests were attempting to
This is a one-character change.
Update memory dependency to 3.0.2.
Remove extra slashed in Master.
Setup java action
Update Master from 6.1.1
Tdigest getPMF() and getCDF()
align master with 6.1.X Also
|
This is a defective PR and shows false differences between files that are identical. |
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.
Once I create a 'main' branch it will initially be based on J-17. After that point, any further fixes to the Java 8-11 version of ds-java in the 6.1.X branch will have to be developed in 6.1.X branch, thus making the 6.1.X effectively the development branch for Java 8-11.
I am having difficulty getting different opinions from git and Eclipse as to whether these to branches are identical or not. Eclipse tells me that they are now identical - which they should be. But 'git difftool ...' says there are differences!
I'm not sure what to believe.
So I want to merge them to make sure they are the same. These tools are impacting my sanity!