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.

Sign up for GitHub

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

Jump to bottom

Merge electron branch. #25

Merged
merged 2 commits into from
Oct 7, 2022
Merged

Merge electron branch. #25

merged 2 commits into from
Oct 7, 2022

Conversation

CollinMcKinney
Copy link
Owner

No description provided.

@CollinMcKinney CollinMcKinney self-assigned this Oct 7, 2022
CollinMcKinney
CollinMcKinney commented Oct 7, 2022
View reviewed changes
Copy link
Owner Author

@CollinMcKinney CollinMcKinney left a comment

Choose a reason for hiding this comment

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

This is not yet functional, but the old code base (going back to the last commit associated with a release) has been moved to the old branch for historical purposes. This PR should close Issue #23 and Issue #24.

CollinMcKinney
CollinMcKinney commented Oct 7, 2022
View reviewed changes
Copy link
Owner Author

@CollinMcKinney CollinMcKinney left a comment

Choose a reason for hiding this comment

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

Furthermore after the electron branch is merged into master, the electron branch should be deleted. This will leave us with master, cleanup, and old branches.

CollinMcKinney
CollinMcKinney commented Oct 7, 2022
View reviewed changes
Copy link
Owner Author

@CollinMcKinney CollinMcKinney left a comment

Choose a reason for hiding this comment

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

We should also then pull changes from master into cleanup so that cleanup can still be used as a branch for staging cleanup related commits.

@CollinMcKinney CollinMcKinney merged commit 9475f86 into master Oct 7, 2022
@CollinMcKinney CollinMcKinney deleted the electron branch October 7, 2022 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@CollinMcKinney CollinMcKinney

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@CollinMcKinney