Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebased spack-packages on Remote Leads to Divergent History on Gadi #165

Closed
CodeGat opened this issue Nov 14, 2024 · 0 comments · Fixed by #166
Closed

Rebased spack-packages on Remote Leads to Divergent History on Gadi #165

CodeGat opened this issue Nov 14, 2024 · 0 comments · Fixed by #166

Comments

@CodeGat
Copy link
Member

CodeGat commented Nov 14, 2024

See run https://github.com/ACCESS-NRI/ACCESS-OM2/actions/runs/11829981295/job/32962759210#step:8:29 - there is history divergence because of rebases on spack-packages development branches.

Instead of using git checkout --force $BRANCH, which still has the divergent branch issue, use git reset --hard origin/$BRANCH, since we only care about what is done on the remote.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant