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

change instances of master branch to main #341

Merged
merged 3 commits into from
Mar 22, 2024

Conversation

abachma2
Copy link
Member

@abachma2 abachma2 commented Mar 21, 2024

This PR changes the instances of master branch to main branch, now that we have changed the default branch for Cyclus, Cycamore, and Cymetric. This addresses one of the item in #337

@abachma2 abachma2 requested review from munkm and nsryan2 March 21, 2024 17:09
@abachma2 abachma2 self-assigned this Mar 21, 2024
Copy link
Contributor

@nsryan2 nsryan2 left a comment

Choose a reason for hiding this comment

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

LGTM, all the links altered in this way are either for cyclus or numpy (which has updated their branch from master to main as well)!

@gonuke
Copy link
Member

gonuke commented Mar 21, 2024

Have we actually updated the default branch of this repo yet, though?

@abachma2
Copy link
Member Author

We have not done it for this repo, but we did do it for each of the others. We should probably hold off on merging this until we change the default for this repo.

@gonuke
Copy link
Member

gonuke commented Mar 22, 2024

This may need a rebase for a few changes I made in the Makefile in #345

@abachma2
Copy link
Member Author

Better?

Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

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

LGTM - thanks @abachma2

@gonuke gonuke merged commit 2fbf211 into cyclus:source Mar 22, 2024
abachma2 added a commit that referenced this pull request Mar 22, 2024
Merge: 024511d 51b9b97
Author: Paul Wilson <[email protected]>

    Merge pull request #341 from abachma2/branch-change
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants