Bug | Failures during fork sync terrafom modules | CircleCI pipeline

Describe the Bug

Failures during fork sync for some terrafom modules, they can not be synced. Some repos presenting this issue:

terraform-aws-vpc
terraform-aws-lambda,
terraform-aws-transit-gateway,

Expected Behavior

The pipeline should run completed and repositories should sync with any problem.

Steps to Reproduce

Steps to reproduce the behavior:

Go to pipeline outputs at CircleCi (https://app.circleci.com/pipelines/github/binbashar/le-dev-tools)
Check the outputs for git-sync-fork-upstream-terraform

Environment (please complete the following information):

CircleCi pipelines

Workflow : nightly_sync_and_release
Job: git-sync-fork-upstream
Step: git-sync-fork-upstream-terraform

Error messages

git merging conflicts

From ssh://github.com/terraform-aws-modules/terraform-aws-vpc
 * [new branch]      master       -> upstream/master
 * [new branch]      terraform011 -> upstream/terraform011
 * [new tag]         v5.0.0       -> v5.0.0
From ssh://github.com/terraform-aws-modules/terraform-aws-vpc
 * branch            master     -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Divergent branches found, trying to rebase...
From ssh://github.com/terraform-aws-modules/terraform-aws-vpc
 * branch            master     -> FETCH_HEAD
Rebasing (1/2)
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging main.tf
CONFLICT (content): Merge conflict in main.tf
Auto-merging outputs.tf
CONFLICT (content): Merge conflict in outputs.tf
Auto-merging variables.tf
CONFLICT (content): Merge conflict in variables.tf
Auto-merging versions.tf
CONFLICT (add/add): Merge conflict in versions.tf
error: could not apply e2f03e1... Initial commit for terraform 0.12 version
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply e2f03e1... Initial commit for terraform 0.12 version
evaluating

Additional Context

Topic discussted here: https://binbashar.slack.com/archives/G5MVCJ48K/p1687543928352309?thread_ts=1687046958.485649&cid=G5MVCJ48K

binbashar / le-dev-tools

Bug | Failures during fork sync terrafom modules | CircleCI pipeline #61