Hi team,
At this point let's consider the openstack/openstack-helm-infra repo frozen. Core team, please do not merge anything to the openstack-helm-infra repo. There are only a few PRs on review [1] at the moment and we will later port them to openstack-helm repo.
We,ve accepted a bunch of patches to reduce the number of merge conflicts during the merger.
Now only one file .gitreview can not be merged automatically. So the procedure (I've tested it) is as follows:
```
mkdir osh_merge_tmp
cd osh_merge_tmp
cd openstack-helm
git fetch openstack-helm-infra
git merge --allow-unrelated-histories openstack-helm-infra/master
## there must be a merge conflict here with the only file .gitreview
git checkout origin/master .gitreview
git merge --continue
```
After that the state of the master branch is ready to be pushed to gerrit (openstack/openstack-helm master).
Tomorrow I am going to reach out to Jeremy in IRC to sync up and to perform the procedure semi-real-time. As we agreed the merged state will be pushed w/o review.
After push is done test jobs WILL BE BROKEN due to wrong paths for test scripts and some Ansible roles/playbooks. We will fix this in the first PR AFTER merger.