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

Use main as Primary Branch #367

Merged
merged 3 commits into from
Dec 9, 2024
Merged

Conversation

ssolson
Copy link
Contributor

@ssolson ssolson commented Dec 5, 2024

This PR updates our git workflow to use main as the MHKiT default branch :

  • Many modern projects use main as the default branch, aligning with the GitHub recommendation and broader conventions.
  • There is some non-linear history in the previous rebase causing issues between develop & master
  • main was created from the current develop branch creating a 1-to-1 liner history between develop and the new main branch

@ssolson ssolson self-assigned this Dec 5, 2024
@ssolson ssolson added the Clean Up Improve code consistency and readability label Dec 5, 2024
@ssolson ssolson marked this pull request as ready for review December 5, 2024 17:51
@ssolson ssolson requested a review from akeeste December 5, 2024 17:51
@akeeste
Copy link
Contributor

akeeste commented Dec 9, 2024

@ssolson I found two more instances of references to the master branch: river_example.ipynb, tidal_example.ipynb (both are referencing MHKiT/examples/data). Can you update those links before merging?

@ssolson ssolson merged commit 8c54773 into MHKiT-Software:develop Dec 9, 2024
43 checks passed
@ssolson ssolson mentioned this pull request Dec 9, 2024
ssolson added a commit that referenced this pull request Dec 11, 2024
This PR updates our git workflow to use `main` as the MHKiT default
branch :
- Many modern projects use `main` as the default branch, aligning with
the GitHub recommendation and broader conventions.
- There is some non-linear history in the previous rebase causing issues
between `develop` & `master`
- `main` was created from the current `develop` branch creating a 1-to-1
liner history between `develop` and the new `main` branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Clean Up Improve code consistency and readability
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants