Command used to build the workspace:
setupATLAS
lsetup git
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-package-pseudomerge.py
--packages Trigger/TrigAnalysis/TrigEgammaAnalysisTools
--source archive/21.0-TrigMC
--target upstream/master
--stage 1 (and 2 after fix all conflicts)
All conflicts were solved comparing the master and TrigMC. Most part of AcceptData strategy are taken from the master branch. Used the ctest and some trigger monitoring scripts (my script) to test everything. This MR fixed the problem related in ATR-19448
See the discussion about the pseudo merge in: ATR-19005
Tagging: @fernando and @thrynova (ringer MT task) and @wsfreund