Merge conflict fix#268
Merged
Merged
Conversation
Add support for ingest of full AIP report and allow saved variant sorting by AIP date.
Hotfix - Add user agent to request to igv content (#239)
* Update gh actions in unit-tests and add setup-java distribution * remove mkdir ../static from build UI in unit-tests.yml action
Author
|
#247 can't be merged because the staging branch has conflicts with main. However the staging branch is protected, so I can't just merge the latest changes from main and then continue with the PR. No, we need this separate PR to update staging so that it's synced with main. My understanding at least. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Merge commits from main into staging so that we can then merge from staging into main 🫠