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

chore(repo): branch consolidation #899

Merged
merged 5 commits into from
Dec 11, 2023
Merged

Conversation

ctrlc03
Copy link
Collaborator

@ctrlc03 ctrlc03 commented Dec 11, 2023

In reference to us establishing GH processes #757 - we decided to keep only one main branch: dev. This PR consolidates master into dev using a rebase so that it can be safely deleted.

Copy link

netlify bot commented Dec 11, 2023

Deploy Preview for maci-typedoc failed.

Name Link
🔨 Latest commit 0d7b99c
🔍 Latest deploy log https://app.netlify.com/sites/maci-typedoc/deploys/65770f15c4ae720008b8c391

omahs and others added 4 commits December 11, 2023 11:27
Signed-off-by: shuoer86 <129674997+shuoer86@users.noreply.github.com>
@ctrlc03 ctrlc03 force-pushed the chore/branch-consolidation branch 10 times, most recently from bc8211c to 93b6c59 Compare December 11, 2023 13:07
@ctrlc03 ctrlc03 force-pushed the chore/branch-consolidation branch from 93b6c59 to 0d7b99c Compare December 11, 2023 13:31
@ctrlc03 ctrlc03 self-assigned this Dec 11, 2023
Copy link
Member

@baumstern baumstern left a comment

Choose a reason for hiding this comment

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

LGTM

@baumstern baumstern merged commit ca3bf86 into dev Dec 11, 2023
11 of 12 checks passed
@baumstern baumstern deleted the chore/branch-consolidation branch December 11, 2023 14:46
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.

4 participants