Skip to content
Snippets Groups Projects

2025-03-28: merge of 24.0 into main

Closed Vakhtang Tsulaia requested to merge tsulaia/athena:sweep_24.0_main_2025-03-28 into main

There were several conflicts related to !74020 (merged). The resolutions were mostly obvious and trivial. Still, it would be good it @bdong double-checked that the results look OK. Here is a list of files with conflicts:

  • InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/ElectronsLoader.h
  • InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/IParticlesLoader.h
  • InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/JetsLoader.h
  • InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/MuonsLoader.h
  • InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/PhotonsLoader.h
  • InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/TracksLoader.h
  • PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2.cxx
  • PhysicsAnalysis/JetTagging/FlavourTaggingTests/CMakeLists.txt
  • Reconstruction/tauRecTools/Root/TauGNN.cxx
  • Reconstruction/tauRecTools/tauRecTools/TauGNN.h

The following MRs have been excluded from the sweep:

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading