Closed domcharrier closed 1 year ago
I'll be asking @lawruble13 to help set up the automation rules for moving changes between branches, so perhaps he can confirm this, but I think that to merge a change back from 5.5 into mainline, the PR should be targeted at master
.
At least on our other repos, the mainline
branch is a one-way sync. The automation infrastructure writes to that branch, but never reads from it.
Thanks @cgmb . I created a duplicate PR for master
and merged it already. Waiting on @lawruble13 's response before continuing here.
@cgmb is correct, the mainline branch should be updated from the manifest file rather than manually. I'll add hipFORT to the job promoting the manifest to the mainline branch.
Patch from rocm branch release/rocm-5.5