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

Quark hooks continued #5907

Merged
merged 7 commits into from
Dec 23, 2022
Merged

Quark hooks continued #5907

merged 7 commits into from
Dec 23, 2022

Conversation

telephon
Copy link
Member

@telephon telephon commented Nov 13, 2022

Purpose and Motivation

This is a continuation of #5780.

See discussion there.

  • Code is tested
  • All tests are passing
  • Updated documentation
  • This PR is ready for review

@telephon telephon mentioned this pull request Nov 14, 2022
4 tasks
@dyfer dyfer added this to the 3.13.0 milestone Nov 14, 2022
@dyfer dyfer changed the base branch from develop to 3.13 November 23, 2022 21:38
@dyfer
Copy link
Member

dyfer commented Nov 23, 2022

Thanks @telephon, this looks good and I'd like to include it in the next RC. Could you please rebase it on the 3.13 branch?

@dyfer
Copy link
Member

dyfer commented Dec 4, 2022

Hello @telephon
Sorry again for the mess with SCVersion.txt. I'm trying to fix it with upcoming merges between 3.13 and develop, but in the meantime could you possibly do interactive rebase on this branch and remove both commits that touch SCVersion.txt (d34f26e and 8d913cd)?

@telephon
Copy link
Member Author

telephon commented Dec 5, 2022

I forgot how to do this. Do you have a hint?

@dyfer
Copy link
Member

dyfer commented Dec 5, 2022

I forgot how to do this. Do you have a hint?

Yes! :)
https://github.com/supercollider/supercollider/wiki/Creating-pull-requests#rebasing-to-remove-commits

@dyfer
Copy link
Member

dyfer commented Dec 22, 2022

@telephon would you be able to rebase this branch to remove the superfluous commits?

@telephon
Copy link
Member Author

I hope this is how it should look like? I am not sure what the final state of this PR should be.

@dyfer
Copy link
Member

dyfer commented Dec 23, 2022

@telephon thanks for making changes! It's close, but not quite there yet.
This PR should only include the changes regarding hooks, i.e. the last 7 commits (from 08b8628 to 88ddbd0). Specifically, 9729e25 and ca23347 should still be removed. Sorry for the hassle! Please let me know if you need any help with this.

@telephon
Copy link
Member Author

ah yes, so this should be better. Thanks!

Copy link
Member

@dyfer dyfer left a comment

Choose a reason for hiding this comment

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

Looks good, thank you!

@dyfer dyfer merged commit a56d924 into supercollider:3.13 Dec 23, 2022
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.

3 participants