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

Consolidate branches: develop into main #82

Merged
merged 23 commits into from
Jan 16, 2025
Merged

Consolidate branches: develop into main #82

merged 23 commits into from
Jan 16, 2025

Conversation

rafmudaf
Copy link
Collaborator

This pull request consolidates that develop branch into main, and the develop branch will be deleted after it's merged. See #78 for more info.

Julian Quick and others added 23 commits February 20, 2024 14:22
Feature: add electrical cabling to wind_farm schema
new field for substation coordinates
Add ground_temperature and roughness_length to schema.
update definition of rotor diameter and rthick
Copy link
Collaborator

@ptrbortolotti ptrbortolotti left a comment

Choose a reason for hiding this comment

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

I think this is good to go, but @bayc just might want to chime in

@bayc
Copy link
Contributor

bayc commented Jan 16, 2025

This looks good to me as well!

@bayc bayc self-requested a review January 16, 2025 15:28
@kilojoules
Copy link
Collaborator

It looks good to me!

@rafmudaf rafmudaf merged commit 456f25d into main Jan 16, 2025
12 checks passed
@rafmudaf rafmudaf deleted the develop branch January 16, 2025 16:49
@rafmudaf rafmudaf restored the develop branch January 16, 2025 16:49
@rafmudaf rafmudaf deleted the develop branch January 16, 2025 16:50
@rafmudaf rafmudaf mentioned this pull request Jan 16, 2025
@rafmudaf
Copy link
Collaborator Author

To delete your local develop branch, do this:

git checkout main
git branch --delete develop

If you have a fork of windIO, you can delete the develop branch there with:

git push --delete <your fork name> develop
# I call my fork "raf", so it would be
git push --delete raf develop

If you do git fetch to get the remote updates and the develop branch still shows as a remote branch, do this:

git remote prune IEAWindTask37  # or whatever you call the remote

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

Successfully merging this pull request may close these issues.

6 participants