Skip to content

Mid#636

Merged
Barthelemy merged 1 commit into
AliceO2Group:masterfrom
gtaillepied:mid
Mar 19, 2021
Merged

Mid#636
Barthelemy merged 1 commit into
AliceO2Group:masterfrom
gtaillepied:mid

Conversation

@gtaillepied
Copy link
Copy Markdown
Contributor

MID folder moved under MUON
added rawDataChecker and UserLogicChecker workflows

@Barthelemy
Copy link
Copy Markdown
Collaborator

I tried to fix the conflict but I think that you need to rebase.

@aphecetche
Copy link
Copy Markdown
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.

@gtaillepied
Copy link
Copy Markdown
Contributor Author

I removed the code additions and cleaned up the history a bit. Now this is only moving the MID folder in MUON.

@dstocco
Copy link
Copy Markdown
Contributor

dstocco commented Mar 16, 2021

@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 Barthelemy merged commit 45d5130 into AliceO2Group:master Mar 19, 2021
Barthelemy pushed a commit to Barthelemy/QualityControl that referenced this pull request Mar 22, 2021
Co-authored-by: gtaillepied <g.taillepied@cern.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants