search

ssc-spc-ccoe-cei / gcp-tools

This repo is meant to be a submodule of the gcp-repo-template repository. https://github.com/ssc-spc-ccoe-cei/gcp-repo-template
3 stars 3 forks source link

re-merge main into monorepo - no squash #31

Closed alaincormier-ssc closed 1 year ago

alaincormier-ssc commented 1 year ago

to fix PR #30 which was completed with "Squash and merge" and seems to cause odd behavior with git history when comparing with main.

this PR will attempt to resolve this by completing it with the Merge strategy