Skip to content

Switch from develop to main#3508

Merged
rickycodes merged 7 commits into
developfrom
feature/swith-to-main
Jan 26, 2022
Merged

Switch from develop to main#3508
rickycodes merged 7 commits into
developfrom
feature/swith-to-main

Conversation

@rickycodes

@rickycodes rickycodes commented Dec 14, 2021

Copy link
Copy Markdown
Contributor

Description

goal: use main instead of develop

sethkfman
sethkfman reviewed Dec 14, 2021
View reviewed changes

@sethkfman sethkfman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think this looks good. We need will need to wait and get main in-sync with develop before this PR is completed.

@rickycodes

rickycodes commented Dec 16, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

@sethkfman 100%. I think sync everything to main first then go through the steps discussed:

Step 1 & 2 could be done before this is merged or after. in the case of us doing it before we'd just have to do them again is all.

# Step 1 
git branch -m develop main

# Step 2
git push -u origin main

# Step 3
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main

# Step 4
# change the default branch on GitHub to main
# add branch protection rules to main
# https://docs.github.com/en/github/administering-a-repository/setting-the-default-branch

# Step 5
git push origin --delete develop

Step 5 is something we could hold off on for a couple months if we're worried about other things we missed, but I think this PR handles all items.

@rickycodes rickycodes marked this pull request as ready for review December 16, 2021 17:28
@rickycodes rickycodes requested a review from a team as a code owner December 16, 2021 17:28
@rickycodes rickycodes added the No QA Needed Apply this label when your PR does not need any QA effort. label Jan 20, 2022
@rickycodes rickycodes merged commit cafc79d into develop Jan 26, 2022
@rickycodes rickycodes deleted the feature/swith-to-main branch January 26, 2022 18:24
@github-actions github-actions Bot locked and limited conversation to collaborators Jan 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@sethkfman sethkfman sethkfman left review comments

@andreahaku andreahaku andreahaku approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

No QA Needed Apply this label when your PR does not need any QA effort.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rickycodes @andreahaku @sethkfman