[bot] Merge 24.7 to 24.11 (Conflicts) #983
Merged
Conversation
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
* Set qcTraceName on ChromatogramGroupId. * Fix error importing Skyline documents with Spectrum Filters (#921) "Spectrum Filter" gets parsed from the Skyline document light:heavy ratios are not calculated for precursors that have a spectrum filter The spectrum filter is used when deciding which chromatogram to read from the .skyd file for a particular precursor. # Conflicts: # src/org/labkey/targetedms/parser/ChromatogramGroupId.java * Added constructor for ChromatogramGroupId that takes both qcTraceName and spectrumFilter. --------- Co-authored-by: nickshulman <[email protected]>
labkey-sweta
force-pushed
the
24.11_fb_bot_merge_24.7
branch
from
b00292c to
b214e94
Compare
labkey-sweta
approved these changes
Nov 25, 2024
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.
Automatic merge failed! Please merge
24.7into24.11_fb_bot_merge_24.7and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=24.11_fb_bot_merge_24.7