Before, when first cloning repo, would have merge conflicts when the scripts goes into submodule folder and tries to pull. This is because the submodule is initialized to a specific commit instead of main. What we can do is once this submodule initializes to a specific commit, we force it to checkout to main, and remove all directory and staged changes, to match with origin/main. Then the submodule would be the latest upon first install.
Tested by
Removed everything in submodule rm -rf extensions/pearai-submodule/{*,.*}
Running ./scripts/pearai/setup-environment.sh to setup
No merge conflicts, no additional changes. Submodule initialized with latest origin/main changes.
Before, when first cloning repo, would have merge conflicts when the scripts goes into submodule folder and tries to pull. This is because the submodule is initialized to a specific commit instead of main. What we can do is once this submodule initializes to a specific commit, we force it to checkout to main, and remove all directory and staged changes, to match with
origin/main. Then the submodule would be the latest upon first install.Tested by
rm -rf extensions/pearai-submodule/{*,.*}./scripts/pearai/setup-environment.shto setupNo merge conflicts, no additional changes. Submodule initialized with latest origin/main changes.