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.

Sign up for GitHub

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

Jump to bottom

Use git reset rather than git checkout for spack-packages update #166

Merged
merged 2 commits into from
Nov 14, 2024
Merged

Use git reset rather than git checkout for spack-packages update #166

merged 2 commits into from
Nov 14, 2024

Conversation

CodeGat
Copy link
Member

@CodeGat CodeGat commented Nov 14, 2024

In this PR:

  • Replace git checkout --force with git reset --hard origin/$BRANCH so the deployment targets spack-packages always has the remotes history, rather than diverging.

Closes #165

@CodeGat CodeGat self-assigned this Nov 14, 2024
@CodeGat CodeGat requested a review from harshula November 14, 2024 03:47
@CodeGat CodeGat requested a review from harshula November 14, 2024 04:01
harshula
harshula approved these changes Nov 14, 2024
View reviewed changes
Copy link
Contributor

@harshula harshula left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤞

@CodeGat CodeGat merged commit 0deb92c into main Nov 14, 2024
@CodeGat CodeGat deleted the 165-reset-spack-packages-to-remote branch November 14, 2024 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harshula harshula harshula approved these changes

Assignees

@CodeGat CodeGat

Labels
priority:high type:bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rebased spack-packages on Remote Leads to Divergent History on Gadi
2 participants
@CodeGat @harshula