Skip to content

opzkit/github

Folders and files

NameName
Last commit message
Last commit date
Jun 18, 2024
Jan 17, 2025
Jan 17, 2025
Oct 21, 2022
Jan 17, 2025
Oct 21, 2022
Oct 21, 2022
Jan 18, 2023
Jan 17, 2025
Oct 21, 2022
Jan 18, 2023
Oct 21, 2022

Repository files navigation

Re-apply template repository

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 ..
done

The above only needs to be done once.

Applying new template changes

git checkout main
git fetch --all
git create branch updates_from_template
git merge template/main --allow-unrelated-histories

Fix potential merge conflicts and then continue

git merge --continue

When finished, push the branch and create a PR. Choose to Squash & Merge the PR

git push --set-upstream origin updates_from_template