Step 1.
Update the repo and checkout the branch we are going to merge
git fetch origin
git checkout -b Bug#38021 origin/Bug#38021
Step 2.
Merge the branch and push the changes to GitLab
git checkout AIA_Develop
git merge --no-ff Bug#38021
git push origin AIA_Develop
