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

CSG Module 2.0 #213

Merged
merged 19 commits into from
May 29, 2023
Merged

CSG Module 2.0 #213

merged 19 commits into from
May 29, 2023

Conversation

RichDom2185
Copy link
Member

Description

This PR aims to supersede #206 due to the incorrect merging there. Refer to it for the full description.

@RichDom2185 RichDom2185 self-assigned this May 29, 2023
@RichDom2185 RichDom2185 mentioned this pull request May 29, 2023
12 tasks
@RichDom2185
Copy link
Member Author

Finally after almost 2 hours of interactive rebasing, this PR should be done. @joeng03 I tried to keep the history as much as possible, but I squashed some commits that introduced the unnecessary files in the .idea folder, to keep the workspace clean. I diffed both this branch and your old branch against master and checked through every file line-by-line to ensure the changes were identical. Should be good now, but do have a look.

Copy link
Member

@martin-henz martin-henz left a comment

Choose a reason for hiding this comment

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

Don't have time to check. Just merge and I'll check in production.

@RichDom2185 RichDom2185 merged commit f72e5a1 into master May 29, 2023
@RichDom2185 RichDom2185 deleted the richard/fix-csg-20 branch October 10, 2023 18:17
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