What To Do With Merged Branches #55
Description
Specs
OS: M3 Mac running Sonoma 14.5
Terminal: iTerm2
Git: 2.45.2
Tomono Commit: 8052bd8
Issue
I am working on getting a series of older packages all consolidated to the new folder. That has worked correctly, however when I git push --all to the repository all the branches besides master show something like 800 commits behind, 4 commits ahead. For example there is a project-cleanup branch that shows 795 commits behind and 4 ahead with those commits being the following:
Move shared auth project files to auth 4.7 project, Remove old project
Move all files to Sdk/Auth/
Root commit for monorepo branch ch/project-cleanup
Merge auth/ch/project-cleanup
The first commit is the from the auth-sdk repository used in the script while the other 3 come from tomono. Is this behavior expected? I have verified that my default branch setting in git matches the branch used across all the repositories master and the master branch shows all expected folders.
My tomono script is the following:
#!/usr/bin/env bash
export MONOREPO_NAME=redacted-packages
./../tomono <<EOF
git@github.com:redacted/Common-Package.git Common
git@github.com:redacted/IoC-Package.git IoC
git@github.com:redacted/Mvc-Package.git Mvc
git@github.com:redacted/media-sdk.git media Sdk/Media
git@github.com:redacted/metrics-sdk.git metrics Sdk/Metrics
git@github.com:redacted/reporting-sdk.git reporting Sdk/Reporting
git@github.com:redacted/auth-sdk.git auth Sdk/Auth
git@github.com:redacted/Cache-Package.git Cache
git@github.com:redacted/Testing-Package.git Testing
EOFAnd I have tested a version with no subfolders:
#!/usr/bin/env bash
export MONOREPO_NAME=redacted-packages
./../tomono <<EOF
git@github.com:redacted/Common-Package.git Common
git@github.com:redacted/IoC-Package.git IoC
git@github.com:redacted/Mvc-Package.git Mvc
git@github.com:redacted/media-sdk.git media
git@github.com:redacted/metrics-sdk.git metrics
git@github.com:redacted/reporting-sdk.git reporting
git@github.com:redacted/auth-sdk.git auth
git@github.com:redacted/Cache-Package.git Cache
git@github.com:redacted/Testing-Package.git Testing
EOFWith the same results.