Typo on Controller Learning wizard resolved

[Bilsteen]

No description provided.

[ronso0]

Thanks for this fix.
It seems the 2.3 branch is also affected. Could you please rebase your branch onto upstream 2.3 (discard all unrelated commits from main branch) and force-push?

[Bilsteen]

Correct me if I am wrong, what i have done is rebased my branch onto the upstream 2.3 branch. Since the 2.3 branch is behind in commits from main, discarded those commits and then forced the branch to 2.3.

[Swiftb0y]

Unfortunately your rebasing resulted in merge conflicts and instead of fixing them, you just committed them, resulting in duplicte code and syntax issues from git's markup. Please take another look at your sourcefile and make sure to commit the correct content, then amend the commit and force push.

[ronso0]

@Bilsteen you don't need to close a PR if there are issues. With git there are always methods to resolve them.
In the very worst case you reset your local branch, set upstream correctly (on top of 2.3 in this case) and git cherry-pick your commit. Then force-push.

[Bilsteen]

@ronso0 I apologize for my mistakes. Actually I was trying to undo the mistakes i made as pointed out by @Swiftb0y , for which i deleted my branch. I am still new to git and figuring stuff out . But i assure you I will make it right.

[Swiftb0y]

No worries, just make sure the file looks right and mixxx compiles, then git add src/controllers/controlpickermenu.cpp, git commit --amend and git push --force.

[ronso0]

Thanks, you made it ; )

[ronso0]

Btw:
Since this is your first contribution we need you to sign the contributor agreement and thereby allows Mixxx to include your changes.

Please comment here when you filled the form and also let us know which name should appear in the contributor list.

[Bilsteen]

Btw: Since this is your first contribution we need you to sign the contributor agreement and thereby allows Mixxx to include your changes.

Please comment here when you filled the form and also let us know which name should appear in the contributor list.

Thanks for helping me throughout the way and yes I have filled the form.