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

Rebase on upstream 0.6.0 #301

Open
3 tasks
real-or-random opened this issue Nov 5, 2024 · 0 comments
Open
3 tasks

Rebase on upstream 0.6.0 #301

real-or-random opened this issue Nov 5, 2024 · 0 comments

Comments

@real-or-random
Copy link
Collaborator

A special difficulty is the musig module. I suggest:

  • One PR/script run for everything before the upstream musig PR.
  • One PR/script run just for the upstream musig PR. We need to solve the conflict manually, but that's easy: simply remove our directory and our changes and prefer upstream.
  • One PR/script run for everything after the upstream musig PR.
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

No branches or pull requests

1 participant