Forward porting for EVOLUTION branch failed

[smuzaffar]

@Dr15Jones @makortel , can you please take care of the forward porting of CMSSW_16_1_X in to CMSSW_16_1_EVOLUTION_X branch. Bot tried to do the automatic forward port but failed. You can run the following to reproduce and fix the conflicts

git clone --depth 1 https://github.com/cms-sw/cms-bot
./cms-bot/auto-update-git-branches -r cms-sw/cmssw -s CMSSW_16_1_X -d CMSSW_16_1_EVOLUTION_X
# this should create a cmssw directory where you can resolve the conflicts  

[smuzaffar]

assign core

[cmsbuild]

New categories assigned: core

@Dr15Jones,@makortel,@smuzaffar you have been requested to review this Pull request/Issue and eventually sign? Thanks

[cmsbuild]

cms-bot internal usage

[cmsbuild]

A new Issue was created by @smuzaffar.

@Dr15Jones, @ftenchini, @makortel, @mandrenguyen, @sextonkennedy, @smuzaffar can you please review it and eventually sign/assign? Thanks.

cms-bot commands are listed here

[smuzaffar]

type evo

[Dr15Jones]

@smuzaffar
I'm starting to look into it now.

[smuzaffar]

thanks @Dr15Jones , #49910 is merged now.

Lets keep this issue for future conflicts

[smuzaffar]

@Dr15Jones , looks like after #49998, we again have to fix the master/EVOLUTION branch merge conflicts . Can you please look in to it and open PR for EVOLUTION branch with merge conflicts resolved?

[smuzaffar]

thanks @Dr15Jones , #50014 is merged now

[smuzaffar]

@Dr15Jones , we again have merge conflicts, can you please open a PR to resolve these