Add template repository as remote:
git remote add template [email protected]:opzkit/tf-template.git;Or for all:
for f in terraform-aws*; do
cd $f && git remote add template [email protected]:opzkit/tf-template.git; git fetch --all && cd ..
doneThe above only needs to be done once.
git checkout main
git fetch --all
git create branch updates_from_template
git merge template/main --allow-unrelated-historiesFix potential merge conflicts and then continue
git merge --continueWhen finished, push the branch and create a PR. Choose to Squash & Merge the PR
git push --set-upstream origin updates_from_template