mmbell / samurai

Spline Analysis at Mesoscale Utilizing Radar and Aircraft Instrumentation
GNU General Public License v3.0
13 stars 16 forks source link

Changing the default branch in git #17

Closed johnmauff closed 4 months ago

johnmauff commented 4 months ago

@mmbell Would it be possible to rename the default branch to be main versus the current name of master. This can be done by following the following instructions:

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/changing-the-default-branch

mmbell commented 4 months ago

I am fine with that suggestion. When I first started this repository the convention was to use "master" but that evidently convention has changed over time. I would be OK with changing it to "main".

sjsprecious commented 4 months ago

Hi @mmbell , also could you protect the "main" branch by following the instructions at https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule? In this way, we could prevent anyone from directly committing changes to the "main" branch in the future.

mmbell commented 4 months ago

@mike-dixon I'm wondering whether this change will affect your lrose-core builds if they explicitly rely on the 'master' branch designation. I am inclined to make this change prior to finalizing the 'Colette' release so that 'main' is the standard moving forward, but want to make you aware of the change and check for any unintended effects on the core. Please advise, thanks.

mike-dixon commented 4 months ago

Hi Michael That should be fine - it won't affect our checkout and build. Thanks Mike

On Fri, Apr 19, 2024 at 7:31 AM Michael M. Bell @.***> wrote:

@mike-dixon https://github.com/mike-dixon I'm wondering whether this change will affect your lrose-core builds if they explicitly rely on the 'master' branch designation. I am inclined to make this change prior to finalizing the 'Colette' release so that 'main' is the standard moving forward, but want to make you aware of the change and check for any unintended effects on the core. Please advise, thanks.

— Reply to this email directly, view it on GitHub https://github.com/mmbell/samurai/issues/17#issuecomment-2066594306, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABTOD77VD73PIPXYJLDWC63Y6EMCTAVCNFSM6AAAAABGNXYUE2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDANRWGU4TIMZQGY . You are receiving this because you were mentioned.Message ID: @.***>

mmbell commented 4 months ago

A new branch named "main" was created off the current "master" and set as the default. Branch protection was added to "main" to enforce pull requests with at least 1 code reviewer for all merges. If there are any other recommended changes to the rules please let me know. I will leave the "master" branch intact temporarily to prevent unintended breakage, but will delete in the near future as it will soon become deprecated. Once everything has been verified and we are happy with the ruleset then we can close this issue.