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

[Frontend Refactor II] Separate stories from src #801

Merged
merged 10 commits into from
May 28, 2024

Conversation

CodyCBakerPhD
Copy link
Collaborator

@garrettmflynn This was the next follow-up right? Anything left to do here?

@CodyCBakerPhD CodyCBakerPhD self-assigned this May 28, 2024
@CodyCBakerPhD
Copy link
Collaborator Author

Well, besides a massive rebase lol

Despite it being branched from #792 looks like a lot of conflicts

@garrettmflynn
Copy link
Member

Other than the rebase, this should be good to go. Was going to hold off on other changes until later—though we may just want to reproduce this and get it in quickly. Could flatten our desired changes into this then too

@CodyCBakerPhD
Copy link
Collaborator Author

Other than the rebase, this should be good to go. Was going to hold off on other changes until later—though we may just want to reproduce this and get it in quickly. Could flatten our desired changes into this then too

Would you want to handle that then? (might be best to just re-implement on a fresh branch if the Git CLI is too messy to handle this)

@garrettmflynn
Copy link
Member

Wasn't too bad to merge. I think we can get this through as-is.

Just FYI, this was a result of merging #800. Was easy to tell since the merge conflicts span the entire file—indicating that each line had some sort of change associated with it.

@CodyCBakerPhD
Copy link
Collaborator Author

Just FYI, this was a result of merging #800. Was easy to tell since the merge conflicts span the entire file—indicating that each line had some sort of change associated with it.

Oh, durr.. the other most common source of massive merge conflicts

@CodyCBakerPhD CodyCBakerPhD enabled auto-merge May 28, 2024 22:09
@CodyCBakerPhD CodyCBakerPhD requested review from garrettmflynn and removed request for garrettmflynn May 28, 2024 22:09
Copy link
Member

@garrettmflynn garrettmflynn left a comment

Choose a reason for hiding this comment

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

Sweet looks good to me

@CodyCBakerPhD
Copy link
Collaborator Author

@garrettmflynn
Copy link
Member

Thanks for pinging me! Looks mostly handled, forgot to review.

@CodyCBakerPhD CodyCBakerPhD merged commit b03fcf2 into main May 28, 2024
21 checks passed
@CodyCBakerPhD CodyCBakerPhD deleted the separate-stories-from-src branch May 28, 2024 23:19
@CodyCBakerPhD
Copy link
Collaborator Author

Awesome - last PR along these lines was about renaming the subfolders for electron, correct?

@garrettmflynn
Copy link
Member

Yep! Will tackle that tomorrow :)

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.

2 participants