Skip to content

Resync the qa branch for mg2021 to master

Andrea Valassi requested to merge valassi/hep-workloads:fixqa-mg2021 into qa-build-mg5amc-madgraph4gpu

Resync the qa branch for mg2021 to master

We should REALLY change the workflow. This MR should be unnecessary. See https://its.cern.ch/jira/browse/BMK-969

Now the qa branch for mg2021 will be identical to master, and I will finally be able to merge my new mg2021 fixes into it (without conflicts, and with a clear view what changed).

I had to fix two conflicts: removed two commits by Domenico which were in qa but not in master. I ALWAYS START FROM MASTER.

  git checkout -b fixqa-mg2021 upstream/qa-build-mg5amc-madgraph4gpu
  git push origin -u fixqa-mg2021
  git revert ef3db8cca665c34caf7dd58798ead55a8673f2d9 3d64ea99cac114681319b39579645110804fd3ae
  git merge upstream/master

Merge request reports