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

numark mixtrack 3: don't change FX level when moving beatgrid #2057

Merged
merged 1 commit into from
Apr 19, 2019

Conversation

mimbert
Copy link
Contributor

@mimbert mimbert commented Mar 18, 2019

controller mapping bugfix for Numark Mixtrack Pro 3: when moving the beatgrid forward or backward with TAP + FX level, it has the buggy side effect of changing the FX level. This commit fixes that.

@uklotzde
Copy link
Contributor

Should the fix be included in 2.2.1? Then please change the target branch of this PR.

@mimbert mimbert changed the base branch from master to 2.2 April 12, 2019 09:39
@mimbert
Copy link
Contributor Author

mimbert commented Apr 12, 2019

The fix is to be included asap, so i guess yes it should be in 2.2.1. I changed the target branch to 2.2
Thanks for noticing this

@mimbert
Copy link
Contributor Author

mimbert commented Apr 12, 2019

But now there's a huge number of conflicts, maybe I should rather create another merge request from scratch, based on branch 2.2 ?

@uklotzde
Copy link
Contributor

Rebasing your local branch on the latest 2.2 should work. Then do a force push and change the target branch afterwards. Creating a new PR would be the last resort.

@uklotzde
Copy link
Contributor

You can re-write and force push your local branch in any way as long as you keep its name. PRs are bound to the URL, i.e. the branch name.

@uklotzde uklotzde changed the base branch from 2.2 to master April 17, 2019 07:32
@uklotzde
Copy link
Contributor

Simply changing the target branch doesn't work:

  • Rename this branch locally
  • Create a new 'numark-mixtrack-pro-3' branch originating from 2.2
  • Cherry-pick your commit
  • Force push to GitHub
  • Change the target of this PR from master to 2.2

@uklotzde uklotzde added this to the 2.2.1 milestone Apr 17, 2019
Copy link
Contributor

@uklotzde uklotzde left a comment

Choose a reason for hiding this comment

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

Needs to be rebuild upon and retargeted to 2.2

@uklotzde
Copy link
Contributor

We also need the permission to distribute your changes by signing the Mixxx contributor agreement.

@uklotzde uklotzde mentioned this pull request Apr 17, 2019
@Be-ing
Copy link
Contributor

Be-ing commented Apr 17, 2019

Considering this has gotten a 👍 from @radusuciu who has this controller, LGTM.

@radusuciu
Copy link
Contributor

Considering this has gotten a 👍 from @radusuciu who has this controller, LGTM.

FYI I no longer have this controller, but the change is minor and it's relatively easy to see the consequence.

@daschuer
Copy link
Member

Thank you!

@daschuer daschuer merged commit 335df4b into mixxxdj:master Apr 19, 2019
@daschuer
Copy link
Member

And cherry-picked to 2.2 ad33458

@daschuer
Copy link
Member

This bug sound quite similar: https://bugs.launchpad.net/bugs/1825659 are they related?

@ghost
Copy link

ghost commented Apr 24, 2019

@daschuer

hello I made some change before him. But I didn't make commits yet.
https://www.mixxx.org/forums/viewtopic.php?f=7&t=7286&start=310#p40876

I really don't understand why it happens............ this bug is very annoying.

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.

5 participants