Mid#636
Merged
Merged
Conversation
Collaborator
|
I tried to fix the conflict but I think that you need to rebase. |
Contributor
|
@gtaillepied would also probably be better to split that PR in 2 : one trivial with just the directory change (MID->MUON/MID) and another with the actual code additions. |
Contributor
Author
|
I removed the code additions and cleaned up the history a bit. Now this is only moving the MID folder in MUON. |
Barthelemy
approved these changes
Mar 15, 2021
Contributor
|
@gtaillepied the Checker complains about conflicting files. Probably you need to update the master and rebase your branch to it. You will have to resolve the conflicts manually though... |
Barthelemy
pushed a commit
to Barthelemy/QualityControl
that referenced
this pull request
Mar 22, 2021
Co-authored-by: gtaillepied <g.taillepied@cern.ch>
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
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.
MID folder moved under MUON
added rawDataChecker and UserLogicChecker workflows